photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename variable buttons to texts and make it globally available

Browse Source
This commit is contained in:
Martin
2017-12-27 17:45:08 +01:00
parent 88677f4af5
commit a4d4ee01be
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+7 -6
View File
@@ -1239,7 +1239,7 @@ function ImageEditor(canvasId, args) {
// Type defaults to wallpaper // Type defaults to wallpaper
type: 'wallpaper', type: 'wallpaper',
// Default texts on the buttons // Default texts on the buttons
buttons: { texts: {
showThreeD: '3d', showThreeD: '3d',
hideThreeD: 'Flat', hideThreeD: 'Flat',
showMurals: 'Show Murals Panel', 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 // Let Canvas know which type it is, canvas or wallpaper since it is
// accessible for all objects contained within. // accessible for all objects contained within.
_canvas.set({ _canvas.set({
__type: _settings.type __type: _settings.type,
__texts: _settings.texts
}); });
// Adding buttons to the canvas depending on which type is active. // 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. // during the initialization of the image editor.
if (_canvas.__type === 'canvas') { if (_canvas.__type === 'canvas') {
_canvas.getButtonMenu() _canvas.getButtonMenu()
.addItem('toggle3d', [_settings.buttons.showThreeD, _settings.buttons.hideThreeD], function () { .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () {
_canvas.toggle3D(this.isActive()); _canvas.toggle3D(this.isActive());
}); });
} else { } else {
_canvas.getButtonMenu() _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()); _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()); _canvas.getViewport().getRulers().enable(this.isActive());
}); });
} }
if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) { if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) {
_canvas.getButtonMenu() _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); util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
}); });
} }
src/ImageEditor.js
+7 -6
View File
@@ -11,7 +11,7 @@ function ImageEditor(canvasId, args) {
// Type defaults to wallpaper // Type defaults to wallpaper
type: 'wallpaper', type: 'wallpaper',
// Default texts on the buttons // Default texts on the buttons
buttons: { texts: {
showThreeD: '3d', showThreeD: '3d',
hideThreeD: 'Flat', hideThreeD: 'Flat',
showMurals: 'Show Murals Panel', 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 // Let Canvas know which type it is, canvas or wallpaper since it is
// accessible for all objects contained within. // accessible for all objects contained within.
_canvas.set({ _canvas.set({
__type: _settings.type __type: _settings.type,
__texts: _settings.texts
}); });
// Adding buttons to the canvas depending on which type is active. // 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. // during the initialization of the image editor.
if (_canvas.__type === 'canvas') { if (_canvas.__type === 'canvas') {
_canvas.getButtonMenu() _canvas.getButtonMenu()
.addItem('toggle3d', [_settings.buttons.showThreeD, _settings.buttons.hideThreeD], function () { .addItem('toggle3d', [_settings.texts.showThreeD, _settings.texts.hideThreeD], function () {
_canvas.toggle3D(this.isActive()); _canvas.toggle3D(this.isActive());
}); });
} else { } else {
_canvas.getButtonMenu() _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()); _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()); _canvas.getViewport().getRulers().enable(this.isActive());
}); });
} }
if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) { if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) {
_canvas.getButtonMenu() _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); util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
}); });
} }