From e8d6e5de343d6022197a8126e7d6b62e840e6ca5 Mon Sep 17 00:00:00 2001
From: Rikard Bartholf <rikard@bartholf.nu>
Date: Tue, 16 May 2017 12:20:52 +0200
Subject: [PATCH] More fixes for canvas product type

---
 src/js/components/ImageEditor/FrameHandler.js |  9 +++++-
 src/js/components/ImageEditor/ImageEditor.js  | 29 ++++++++++++-------
 src/js/components/ImageEditor/Viewport.js     |  5 ++--
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/js/components/ImageEditor/FrameHandler.js b/src/js/components/ImageEditor/FrameHandler.js
index 1670b46..be21126 100644
--- a/src/js/components/ImageEditor/FrameHandler.js
+++ b/src/js/components/ImageEditor/FrameHandler.js
@@ -54,11 +54,18 @@ function FrameHandler(viewport) {
      * @return {FrameHandler}
      */
     this.setFrames = function (frameType) {
+        frameType = frameType || _frameType;
+        _frameType = frameType;
+
+        if (!frameType) {
+            return;
+        }
+
         if (frameType === 'none') {
             return this.setVisible(false);
         }
 
-        _frameType = frameType;
+        this.setVisible(true);
 
         _frames.top.height =
         _frames.bottom.height =
diff --git a/src/js/components/ImageEditor/ImageEditor.js b/src/js/components/ImageEditor/ImageEditor.js
index 1c1e9a2..bc4e82f 100644
--- a/src/js/components/ImageEditor/ImageEditor.js
+++ b/src/js/components/ImageEditor/ImageEditor.js
@@ -18,17 +18,24 @@ function ImageEditor(canvasId, args) {
         __type: _settings.type
     });
 
-    _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();
+    if (_canvas.__type === 'canvas') {
+        _canvas.getButtonMenu()
+            .addItem('3D', function () {})
+            .addItem('Flat', function () {})
+            .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/components/ImageEditor/Viewport.js b/src/js/components/ImageEditor/Viewport.js
index 99be740..7c09e94 100644
--- a/src/js/components/ImageEditor/Viewport.js
+++ b/src/js/components/ImageEditor/Viewport.js
@@ -10,6 +10,7 @@ function Viewport(canvas) {
     var _borderWidth = 2;
     var _data = null;
     var _rect;
+    var self = this;
 
     /**
      * Applies viewport to page
@@ -42,7 +43,7 @@ function Viewport(canvas) {
         }
 
         canvas.getDragbars().apply();
-
+        self.setFrame();
         // Apertures sometimes overlaps the viewports bounding rect.
         // Solve this by bringing it to the front after apertures are applied.
         _rect.bringToFront();
@@ -136,7 +137,7 @@ function Viewport(canvas) {
      */
     this.setFrame = function (frameType) {
         this.getFrameHandler().setFrames(frameType);
-    }
+    };
 
     this.getData = function () {
         return _data;