From a4d4ee01be0c4a5f55c6c08470a47cf0de2362bd Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 27 Dec 2017 17:45:08 +0100 Subject: [PATCH] rename variable buttons to texts and make it globally available --- dist/image-editor.js | 13 +++++++------ src/ImageEditor.js | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dist/image-editor.js b/dist/image-editor.js index a5d9932..b003743 100644 --- a/dist/image-editor.js +++ b/dist/image-editor.js @@ -1239,7 +1239,7 @@ function ImageEditor(canvasId, args) { // Type defaults to wallpaper type: 'wallpaper', // Default texts on the buttons - buttons: { + texts: { showThreeD: '3d', hideThreeD: 'Flat', showMurals: 'Show Murals Panel', @@ -1266,7 +1266,8 @@ function ImageEditor(canvasId, args) { // Let Canvas know which type it is, canvas or wallpaper since it is // accessible for all objects contained within. _canvas.set({ - __type: _settings.type + __type: _settings.type, + __texts: _settings.texts }); // Adding buttons to the canvas depending on which type is active. @@ -1274,22 +1275,22 @@ function ImageEditor(canvasId, args) { // during the initialization of the image editor. if (_canvas.__type === 'canvas') { _canvas.getButtonMenu() - .addItem('toggle3d', [_settings.buttons.showThreeD, _settings.buttons.hideThreeD], function () { + .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () { _canvas.toggle3D(this.isActive()); }); } else { _canvas.getButtonMenu() - .addItem('toggleMurals', [_settings.buttons.showMurals, _settings.buttons.hideMurals], function () { + .addItem('toggleMurals', [_settings.texts.showMurals, _settings.texts.hideMurals], function () { _canvas.getViewport().getGores().enable(this.isActive()); }) - .addItem('toggleRulers', [_settings.buttons.showRulers, _settings.buttons.hideRulers], function () { + .addItem('toggleRulers', [_settings.texts.showRulers, _settings.texts.hideRulers], function () { _canvas.getViewport().getRulers().enable(this.isActive()); }); } if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) { _canvas.getButtonMenu() - .addItem('toggleFullscreen', [_settings.buttons.showFullscreen, _settings.buttons.exitFullscreen], function () { + .addItem('toggleFullscreen', [_settings.texts.showFullscreen, _settings.texts.exitFullscreen], function () { util.toggleFullscreen(_canvas.getSelectionElement().parentNode); }); } diff --git a/src/ImageEditor.js b/src/ImageEditor.js index 85ecb90..b263fd5 100644 --- a/src/ImageEditor.js +++ b/src/ImageEditor.js @@ -11,7 +11,7 @@ function ImageEditor(canvasId, args) { // Type defaults to wallpaper type: 'wallpaper', // Default texts on the buttons - buttons: { + texts: { showThreeD: '3d', hideThreeD: 'Flat', showMurals: 'Show Murals Panel', @@ -38,7 +38,8 @@ function ImageEditor(canvasId, args) { // Let Canvas know which type it is, canvas or wallpaper since it is // accessible for all objects contained within. _canvas.set({ - __type: _settings.type + __type: _settings.type, + __texts: _settings.texts }); // Adding buttons to the canvas depending on which type is active. @@ -46,22 +47,22 @@ function ImageEditor(canvasId, args) { // during the initialization of the image editor. if (_canvas.__type === 'canvas') { _canvas.getButtonMenu() - .addItem('toggle3d', [_settings.buttons.showThreeD, _settings.buttons.hideThreeD], function () { + .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () { _canvas.toggle3D(this.isActive()); }); } else { _canvas.getButtonMenu() - .addItem('toggleMurals', [_settings.buttons.showMurals, _settings.buttons.hideMurals], function () { + .addItem('toggleMurals', [_settings.texts.showMurals, _settings.texts.hideMurals], function () { _canvas.getViewport().getGores().enable(this.isActive()); }) - .addItem('toggleRulers', [_settings.buttons.showRulers, _settings.buttons.hideRulers], function () { + .addItem('toggleRulers', [_settings.texts.showRulers, _settings.texts.hideRulers], function () { _canvas.getViewport().getRulers().enable(this.isActive()); }); } if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) { _canvas.getButtonMenu() - .addItem('toggleFullscreen', [_settings.buttons.showFullscreen, _settings.buttons.exitFullscreen], function () { + .addItem('toggleFullscreen', [_settings.texts.showFullscreen, _settings.texts.exitFullscreen], function () { util.toggleFullscreen(_canvas.getSelectionElement().parentNode); }); }