From 6ac64d18bde0a01cbe149cf0719149d9e6d4f777 Mon Sep 17 00:00:00 2001
From: Rikard Bartholf <rikard@bartholf.nu>
Date: Wed, 17 May 2017 12:46:22 +0200
Subject: [PATCH] Fix initialization of ButtonMenu

---
 index.php                                    |  2 +-
 src/js/components/ImageEditor/Canvas.js      |  4 ++-
 src/js/components/ImageEditor/ImageEditor.js | 38 ++++++++++----------
 src/js/init.js                               |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/index.php b/index.php
index cb11d92..c468ed3 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@
     </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.7.11/fabric.js"></script>
-    <script src="/dist/js/pw-image-editor.js"></script>
+    <script src="/dist/js/main.js"></script>
     <script src="/dist/js/init.js"></script>
 </body>
 </html>
diff --git a/src/js/components/ImageEditor/Canvas.js b/src/js/components/ImageEditor/Canvas.js
index a8b6965..30b379a 100644
--- a/src/js/components/ImageEditor/Canvas.js
+++ b/src/js/components/ImageEditor/Canvas.js
@@ -1,4 +1,5 @@
 'use strict';
+var config = require('../config');
 var util = require('../util');
 var ApertureHandler = require('./ApertureHandler');
 var ButtonMenu = require('./ButtonMenu');
@@ -62,7 +63,8 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
      */
     getButtonMenu: function (settings) {
         if (!this.__buttonMenu) {
-            this.__buttonMenu = new ButtonMenu(this, settings);
+            var defaults = config.buttonMenu[this.__type];
+            this.__buttonMenu = new ButtonMenu(this, $.extend({}, defaults, settings));
         }
         return this.__buttonMenu;
     },
diff --git a/src/js/components/ImageEditor/ImageEditor.js b/src/js/components/ImageEditor/ImageEditor.js
index 2223dd0..252ccba 100644
--- a/src/js/components/ImageEditor/ImageEditor.js
+++ b/src/js/components/ImageEditor/ImageEditor.js
@@ -23,26 +23,24 @@ function ImageEditor(canvasId, args) {
      * @TODO: Refactor this. Since Canvas knows the type of editor it probably
      *        better could reside there.
      */
-    $(function () {
-        if (_canvas.__type === 'canvas') {
-            _canvas.getButtonMenu(config.buttonMenu.canvas)
-                .addItem('3D', function () {})
-                .addItem('Flat', function () {}, true)
-                .render();
-        } else {
-            _canvas.getButtonMenu(config.buttonMenu.wallpaper)
-                .addItem(['Show Murals Panel', 'Hide Murals Panel'], function () {
-                    _canvas.getViewport().getGores().enable(this.isActive());
-                })
-                .addItem(['Show Ruler', 'Hide Ruler'], function () {
-                    _canvas.getViewport().getRulers().enable(this.isActive());
-                })
-                .addItem(['Fullscreen', 'Exit Fullscreen'], function () {
-                    util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
-                })
-                .render();
-        }
-    });
+    if (_canvas.__type === 'canvas') {
+        _canvas.getButtonMenu()
+            .addItem('3D', function () {})
+            .addItem('Flat', function () {}, true)
+            .render();
+    } else {
+        _canvas.getButtonMenu()
+            .addItem(['Show Murals Panel', 'Hide Murals Panel'], function () {
+                _canvas.getViewport().getGores().enable(this.isActive());
+            })
+            .addItem(['Show Ruler', 'Hide Ruler'], function () {
+                _canvas.getViewport().getRulers().enable(this.isActive());
+            })
+            .addItem(['Fullscreen', 'Exit Fullscreen'], function () {
+                util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
+            })
+            .render();
+    }
 
     /**
      * Crops image to desired dimensions
diff --git a/src/js/init.js b/src/js/init.js
index f38667b..82cb1f8 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': 'wallpaper'})
+    var editor = new ImageEditor('canvas-editor', {'type': 'canvas'})
         .loadImage(imageUrl, function() {
             $input.w.trigger('input');
         });