Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #495 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 46480
This commit is contained in:
Julia Radzhabova 2020-09-07 16:06:07 +03:00 committed by GitHub
parent b92ba5fbaa fef25e6032
commit 0b9d43e60b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/documenteditor/main/app/controller/Main.js
View file

@ -2251,10 +2251,15 @@ define([
var me = this;
var _disable_ui = function (disable) {
me.disableEditing(disable);
DE.getController('DocumentHolder').getView().SetDisabled(disable, true);
DE.getController('Navigation') && DE.getController('Navigation').SetDisabled(disable);
DE.getController('LeftMenu').setPreviewMode(disable);
var comments = DE.getController('Common.Controllers.Comments');
var app = me.getApplication();
app.getController('DocumentHolder').getView().SetDisabled(disable, true);
app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
var leftMenu = app.getController('LeftMenu');
leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
leftMenu.setPreviewMode(disable);
var comments = app.getController('Common.Controllers.Comments');
if (comments) comments.setPreviewMode(disable);
};

13
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1899,12 +1899,15 @@ define([
var me = this;
Common.Utils.warningDocumentIsLocked({
disablefunc: function (disable) {
var app = me.getApplication();
me.disableEditing(disable);
PE.getController('RightMenu').SetDisabled(disable, true);
PE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
PE.getController('DocumentHolder').getView('DocumentHolder').SetDisabled(disable);
PE.getController('LeftMenu').setPreviewMode(disable);
var comments = PE.getController('Common.Controllers.Comments');
app.getController('RightMenu').SetDisabled(disable, true);
app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
app.getController('DocumentHolder').getView('DocumentHolder').SetDisabled(disable);
var leftMenu = app.getController('LeftMenu');
leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
leftMenu.setPreviewMode(disable);
var comments = app.getController('Common.Controllers.Comments');
if (comments) comments.setPreviewMode(disable);
}});
},

21
apps/presentationeditor/main/app/view/FileMenu.js
View file

@ -147,6 +147,10 @@ define([
caption : this.btnProtectCaption,
canFocused: false
});
if ( !!this.options.miProtect ) {
this.miProtect.setDisabled(this.options.miProtect.isDisabled());
delete this.options.miProtect;
}
this.miRecent = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-recent'),
@ -410,11 +414,20 @@ define([
},
getButton: function(type) {
if (type == 'save') {
if (this.rendered)
return this.miSave;
else
if ( !this.rendered ) {
if (type == 'save') {
return this.options.miSave ? this.options.miSave : (this.options.miSave = new Common.UI.MenuItem({}));
} else
if (type == 'protect') {
return this.options.miProtect ? this.options.miProtect : (this.options.miProtect = new Common.UI.MenuItem({}));
}
} else {
if (type == 'save') {
return this.miSave;
} else
if (type == 'protect') {
return this.miProtect;
}
}
},

16
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -2212,13 +2212,15 @@ define([
Common.Utils.warningDocumentIsLocked({
disablefunc: function (disable) {
me.disableEditing(disable);
SSE.getController('RightMenu').SetDisabled(disable, true);
SSE.getController('Statusbar').SetDisabled(disable);
SSE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
SSE.getController('DocumentHolder').SetDisabled(disable, true);
SSE.getController('LeftMenu').setPreviewMode(disable);
var comments = SSE.getController('Common.Controllers.Comments');
var app = me.getApplication();
app.getController('RightMenu').SetDisabled(disable, true);
app.getController('Statusbar').SetDisabled(disable);
app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
app.getController('DocumentHolder').SetDisabled(disable, true);
var leftMenu = app.getController('LeftMenu');
leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
leftMenu.setPreviewMode(disable);
var comments = app.getController('Common.Controllers.Comments');
if (comments) comments.setPreviewMode(disable);
}});
},

21
apps/spreadsheeteditor/main/app/view/FileMenu.js
View file

@ -134,6 +134,10 @@ define([
caption : this.btnProtectCaption,
canFocused: false
});
if ( !!this.options.miProtect ) {
this.miProtect.setDisabled(this.options.miProtect.isDisabled());
delete this.options.miProtect;
}
this.miRecent = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-recent'),
@ -389,11 +393,20 @@ define([
},
getButton: function(type) {
if (type == 'save') {
if (this.rendered)
return this.miSave;
else
if ( !this.rendered ) {
if (type == 'save') {
return this.options.miSave ? this.options.miSave : (this.options.miSave = new Common.UI.MenuItem({}));
} else
if (type == 'protect') {
return this.options.miProtect ? this.options.miProtect : (this.options.miProtect = new Common.UI.MenuItem({}));
}
} else {
if (type == 'save') {
return this.miSave;
} else
if (type == 'protect') {
return this.miProtect;
}
}
},