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

[DE] Fix locking for content controls

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-22 10:43:56 +03:00
parent 25a9ca56ed
commit 35619396f5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -759,11 +759,12 @@ define([
(lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
if (!need_disable) { toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked);
if (!(paragraph_locked || header_locked)) {
var control_disable = control_plain || content_locked; var control_disable = control_plain || content_locked;
for (var i=0; i<7; i++) for (var i=0; i<7; i++)
toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); toolbar.btnContentControls.menu.items[i].setDisabled(control_disable);
toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || content_locked); toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control);
} }

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

@ -704,7 +704,7 @@ define([
] ]
}) })
}); });
this.paragraphControls.push(this.btnContentControls); // this.paragraphControls.push(this.btnContentControls);
this.btnColumns = new Common.UI.Button({ this.btnColumns = new Common.UI.Button({
id: 'tlbtn-columns', id: 'tlbtn-columns',