From c2806adbb2849ed648f98154d79047123c8a181b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2023 20:48:22 +0300 Subject: [PATCH] [DE] Lock draw buttons --- apps/common/main/lib/view/Draw.js | 10 +++++++--- apps/documenteditor/main/app/controller/Toolbar.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js index bbf4c2316b..5cda6a91ad 100644 --- a/apps/common/main/lib/view/Draw.js +++ b/apps/common/main/lib/view/Draw.js @@ -99,6 +99,7 @@ define([ var filter = Common.localStorage.getKeysFilter(); this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : ''; + var _set = Common.enumLock; var penOptions = [ {hint: this.txtPen, color: 'FF0000', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}}, {hint: this.txtPen, color: '00FF00', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}}, @@ -117,7 +118,8 @@ define([ dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small', - penOptions: props + penOptions: props, + lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments] }); me.btnsPen.push(btn); me.lockedControls.push(btn); @@ -131,7 +133,8 @@ define([ allowDepress: true, dataHint : '1', dataHintDirection: 'bottom', - dataHintOffset: 'small' + dataHintOffset: 'small', + lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments] }); this.lockedControls.push(this.btnEraser); @@ -141,7 +144,8 @@ define([ caption: this.txtSelect, dataHint : '1', dataHintDirection: 'bottom', - dataHintOffset: 'small' + dataHintOffset: 'small', + lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments] }); this.lockedControls.push(this.btnSelect); diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6aeb4dd8ab..25529143c9 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3306,6 +3306,8 @@ define([ tab = {action: 'draw', caption: me.toolbar.textTabDraw, extcls: 'canedit', layoutname: 'toolbar-draw', dataHintTitle: 'D'}; me.toolbar.addTab(tab, $panel, 2); me.toolbar.setVisible('draw', Common.UI.LayoutManager.isElementVisible('toolbar-draw')); + Array.prototype.push.apply(me.toolbar.lockControls, drawtab.getView().getButtons()); + Array.prototype.push.apply(me.toolbar.paragraphControls, drawtab.getView().getButtons()); } if ( config.canProtect ) {