P5-2244 - Initialize editor with frame

dist/image-editor.js

@@ -942,7 +942,7 @@ var config = require('./config');
 
 function FrameHandler(viewport) {
     var _frames;
-    var _frameType = 'image';
+    var _frameType = viewport.canvas.__canvasFrameType;
 
     function getFramesAsArray() {
         return [
@@ -1239,6 +1239,8 @@ function ImageEditor(canvasId, args) {
     var _settings = $.extend({
         // Type defaults to wallpaper
         type: 'wallpaper',
+        // canvasFrameType defaults to image on frame
+        canvasFrameType: 'image',
         // Default texts on the buttons
         texts: {
             showThreeD: '3d',
@@ -1281,6 +1283,9 @@ function ImageEditor(canvasId, args) {
             .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () {
                 _canvas.toggle3D(this.isActive());
             });
+        _canvas.set({
+            __canvasFrameType: _settings.canvasFrameType
+        });
     } else {
         _canvas.getButtonMenu()
             .addItem('toggleMurals', [_settings.texts.showMurals, _settings.texts.hideMurals], function () {

src/FrameHandler.js

@@ -5,7 +5,7 @@ var config = require('./config');
 
 function FrameHandler(viewport) {
     var _frames;
-    var _frameType = 'image';
+    var _frameType = viewport.canvas.__canvasFrameType;
 
     function getFramesAsArray() {
         return [

src/ImageEditor.js

@@ -10,6 +10,8 @@ function ImageEditor(canvasId, args) {
     var _settings = $.extend({
         // Type defaults to wallpaper
         type: 'wallpaper',
+        // canvasFrameType defaults to image on frame
+        canvasFrameType: 'image',
         // Default texts on the buttons
         texts: {
             showThreeD: '3d',
@@ -52,6 +54,9 @@ function ImageEditor(canvasId, args) {
             .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () {
                 _canvas.toggle3D(this.isActive());
             });
+        _canvas.set({
+            __canvasFrameType: _settings.canvasFrameType
+        });
     } else {
         _canvas.getButtonMenu()
             .addItem('toggleMurals', [_settings.texts.showMurals, _settings.texts.hideMurals], function () {