From 9803376e20ebac393bd34edfb6d0a5fe51ccf2b5 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@weahead.se>
Date: Tue, 16 May 2017 12:53:23 +0200
Subject: [PATCH] Fixed issue with config for ruler

---
 src/js/components/ImageEditor/RulerHandler.js | 9 ++++++++-
 src/js/components/ImageEditor/TextButton.js   | 4 ++--
 src/js/components/config/ruler-handle.js      | 3 ++-
 src/js/init.js                                | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/js/components/ImageEditor/RulerHandler.js b/src/js/components/ImageEditor/RulerHandler.js
index e5cc6b7..939d4d6 100644
--- a/src/js/components/ImageEditor/RulerHandler.js
+++ b/src/js/components/ImageEditor/RulerHandler.js
@@ -37,7 +37,14 @@ function RulerHandler(viewport) {
                 0, 0,
                 axis === 'h' ? bounds.width : 0,
                 axis === 'v' ? bounds.height : 0
-            ], config.rulerHandle.line(axis, bounds));
+            ], {
+            evented: false,
+            strokeDashArray: [5, 5],
+            stroke: '#000',
+            strokeWidth: 1,
+            top: axis === 'h' ? bounds.top + bounds.height / 2 : bounds.top,
+            left: axis === 'v' ? bounds.left + bounds.width / 2 : bounds.left
+        });
     }
 
     /**
diff --git a/src/js/components/ImageEditor/TextButton.js b/src/js/components/ImageEditor/TextButton.js
index 6a31273..583d516 100644
--- a/src/js/components/ImageEditor/TextButton.js
+++ b/src/js/components/ImageEditor/TextButton.js
@@ -14,8 +14,8 @@ function TextButton(text, settings) {
     var _rect = null;
     var _text = null;
 
-    var _rectSettings = config.textButton.rect(settings.width, settings.height);
-    var _textSettings = $.extend({}, config.textButton.text, {
+    var _rectSettings = $.extend({}, config.textButton.rect(settings.width, settings.height));
+    var _textSettings = $.extend({}, config.textButton.text, settings, {
         text: Array.isArray(text) ? text[0] : text,
         textActive: Array.isArray(text) ? text[1] : text,
     });
diff --git a/src/js/components/config/ruler-handle.js b/src/js/components/config/ruler-handle.js
index 297a2bc..66fd53c 100644
--- a/src/js/components/config/ruler-handle.js
+++ b/src/js/components/config/ruler-handle.js
@@ -14,9 +14,10 @@ module.exports = {
     },
 
     text: {
+        fontSize: 12,
         width: 75,
         height: 20,
-        color: '#33ff33',
+        fill: '#33ff33',
     },
 
     h: function(lines, bounds) {
diff --git a/src/js/init.js b/src/js/init.js
index 82cb1f8..f38667b 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -13,7 +13,7 @@
 
     var imageUrl = '//images.photowall.com/products/' + $input.image_id.val() + '.jpg?h=450';
 
-    var editor = new ImageEditor('canvas-editor', {'type': 'canvas'})
+    var editor = new ImageEditor('canvas-editor', {'type': 'wallpaper'})
         .loadImage(imageUrl, function() {
             $input.w.trigger('input');
         });