diff --git a/dist/image-editor.js b/dist/image-editor.js index 033df6d..b686beb 100644 --- a/dist/image-editor.js +++ b/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 () { diff --git a/src/FrameHandler.js b/src/FrameHandler.js index ea8c330..71c0b7a 100644 --- a/src/FrameHandler.js +++ b/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 [ diff --git a/src/ImageEditor.js b/src/ImageEditor.js index c975064..4c9de89 100644 --- a/src/ImageEditor.js +++ b/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 () {