From 4617f9f92de5b9fbe697087f492f548a9c739aa2 Mon Sep 17 00:00:00 2001
From: Rikard Bartholf <rikard@bartholf.nu>
Date: Mon, 15 May 2017 15:32:56 +0200
Subject: [PATCH] Begin implement canvas editor

---
 src/js/components/ImageEditor/ImageEditor.js | 5 +++++
 src/js/components/ImageEditor/Viewport.js    | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/js/components/ImageEditor/ImageEditor.js b/src/js/components/ImageEditor/ImageEditor.js
index 7025da1..1c1e9a2 100644
--- a/src/js/components/ImageEditor/ImageEditor.js
+++ b/src/js/components/ImageEditor/ImageEditor.js
@@ -12,6 +12,11 @@ function ImageEditor(canvasId, args) {
 
     // Initialize canvas
     _canvas = new Canvas(canvasId);
+    // Let Canvas know which type it is, canvas or wallpaper since it is
+    // accessible for all objects contained within.
+    _canvas.set({
+        __type: _settings.type
+    });
 
     _canvas.getButtonMenu()
         .addItem(['Show Murals Panel', 'Hide Murals Panel'], function () {
diff --git a/src/js/components/ImageEditor/Viewport.js b/src/js/components/ImageEditor/Viewport.js
index c242709..2d5500d 100644
--- a/src/js/components/ImageEditor/Viewport.js
+++ b/src/js/components/ImageEditor/Viewport.js
@@ -22,7 +22,7 @@ function Viewport(canvas) {
             width: _data.width,
             height: _data.height,
             stroke: '#fff',
-            strokeWidth: _borderWidth,
+            strokeWidth: canvas.__type === 'canvas' ? 0 : _borderWidth
         });
 
         _rect.width += _borderWidth;
@@ -34,7 +34,12 @@ function Viewport(canvas) {
             .drag.enable(calcMinMaxBoundsForRect(_rect.getInsideBoundingRect(), canvas.getImage()));
         canvas.getApertures().apply(_data.axis, _rect.getBoundingRect());
 
-        drawBeams();
+        if (canvas.__type !== 'canvas') {
+            drawBeams();
+        } else {
+            // drawFrames
+        }
+
         canvas.getDragbars().apply();
 
         // Apertures sometimes overlaps the viewports bounding rect.