P5-1808 hide Fullscreen button

This commit is contained in:
Oleg Milkin
2017-10-25 13:17:07 +03:00
parent 16a85b1431
commit e892946ca0
5 changed files with 1937 additions and 1930 deletions
+1
View File
@@ -1,4 +1,5 @@
node_modules
*.sublime-project
*.sublime-workspace
*.idea
dist
+4 -2
View File
@@ -1212,7 +1212,8 @@ function ImageEditor(canvasId, args) {
height: 600
},
// Default unit
unit: 'cm'
unit: 'cm',
isVisibleFullscreenButton: true
}, args);
@@ -1243,7 +1244,7 @@ function ImageEditor(canvasId, args) {
});
}
if (util.supportsFullscreen()) {
if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) {
_canvas.getButtonMenu()
.addItem('toggleFullscreen', [_settings.buttons.showFullscreen, _settings.buttons.exitFullscreen], function () {
util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
@@ -1265,6 +1266,7 @@ function ImageEditor(canvasId, args) {
button.setActive(false);
}
});
});
/**
+2 -1
View File
@@ -30,7 +30,8 @@
var posY = document.getElementById('pos-y');
var editor = new ImageEditor('image-editor', {
type: 'canvas'
type: 'canvas',
isVisibleFullscreenButton: false
});
function cropImage() {
+2 -1
View File
@@ -19,7 +19,8 @@
var wrapper = document.getElementById('wrapper');
var editor = new ImageEditor('image-editor', {
type: 'photo-wallpaper'
type: 'photo-wallpaper',
isVisibleFullscreenButton: false
});
function cropImage() {
+4 -2
View File
@@ -26,7 +26,8 @@ function ImageEditor(canvasId, args) {
height: 600
},
// Default unit
unit: 'cm'
unit: 'cm',
isVisibleFullscreenButton: true
}, args);
@@ -57,7 +58,7 @@ function ImageEditor(canvasId, args) {
});
}
if (util.supportsFullscreen()) {
if (util.supportsFullscreen() && _settings.isVisibleFullscreenButton) {
_canvas.getButtonMenu()
.addItem('toggleFullscreen', [_settings.buttons.showFullscreen, _settings.buttons.exitFullscreen], function () {
util.toggleFullscreen(_canvas.getSelectionElement().parentNode);
@@ -79,6 +80,7 @@ function ImageEditor(canvasId, args) {
button.setActive(false);
}
});
});
/**