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

[DE] Fix disable for several actions

Browse source
This commit is contained in:
Julia Radzhabova 2021-06-30 15:19:45 +03:00
parent 68fc002dc3
commit 6506146eab
6 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/IrregularStack.js
View file

@ -69,7 +69,7 @@ Common.IrregularStack = function(config) {
}
var _get = function(obj) {
var index = _indexOf(obj, _weakCompare);
var index = (typeof obj === 'object')? _indexOf(obj, _weakCompare) : obj;
if (index != -1)
return _stack[index];
return undefined;
@ -79,10 +79,15 @@ Common.IrregularStack = function(config) {
return !(_indexOf(obj, _strongCompare) < 0);
}
var _length = function() {
return _stack.length;
}
return {
push: _push,
pop: _pop,
get: _get,
exist: _exist
exist: _exist,
length: _length
}
};

2
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -747,7 +747,7 @@ define([
documentHolder: true,
toolbar: true,
plugins: true
});
}, 'review');
if (this.view) {
this.view.$el.find('.no-group-mask.review').css('opacity', 1);

2
apps/documenteditor/main/app/controller/FormsTab.js
View file

@ -272,7 +272,7 @@ define([
documentHolder: true,
toolbar: true,
plugins: false
});
}, 'forms');
if (this.view)
this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
}

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

@ -161,6 +161,11 @@ define([
weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
});
this.stackDisableActions = new Common.IrregularStack({
strongCompare : function(obj1, obj2){return obj1.type === obj2.type;},
weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
});
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false, isDocModified: false};
this.languages = null;
@ -725,20 +730,24 @@ define([
documentHolder: true,
toolbar: true,
plugins: false
});
}, temp ? 'reconnect' : 'disconnect');
},
onEditingDisable: function(disable, options) {
onEditingDisable: function(disable, options, type) {
var app = this.getApplication();
if (this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
if (options.rightMenu) {
options.rightMenu.clear && app.getController('RightMenu').getView('RightMenu').clearSelection();
options.rightMenu.disable && app.getController('RightMenu').SetDisabled(disable, options.allowMerge, options.allowSignature);
}
if (options.statusBar) {
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
}
var action = {type: type, disable: disable, options: options};
if (disable && !this.stackDisableActions.get({type: type}))
this.stackDisableActions.push(action);
!disable && this.stackDisableActions.pop({type: type});
var prev_options = !disable && (this.stackDisableActions.length()>0) ? this.stackDisableActions.get(this.stackDisableActions.length()-1) : null;
if (options.rightMenu && app.getController('RightMenu')) {
options.rightMenu.clear && app.getController('RightMenu').getView('RightMenu').clearSelection();
options.rightMenu.disable && app.getController('RightMenu').SetDisabled(disable, options.allowMerge, options.allowSignature);
}
if (options.statusBar) {
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
}
if (options.review) {
app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
@ -774,6 +783,10 @@ define([
if (options.plugins) {
app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
}
if (prev_options) {
this.onEditingDisable(prev_options.disable, prev_options.options, prev_options.type);
}
},
onRequestClose: function() {

2
apps/documenteditor/main/app/view/MailMergeSettings.js
View file

@ -818,7 +818,7 @@ define([
documentHolder: true,
toolbar: true,
plugins: false
});
}, 'mailmerge');
this.lockControls(DE.enumLockMM.preview, disable, {array: [this.btnInsField, this.btnEditData]});
},

2
apps/documenteditor/main/app/view/SignatureSettings.js
View file

@ -412,7 +412,7 @@ define([
documentHolder: true,
toolbar: true,
plugins: false
});
}, 'signature');
}
},