From 175a09345d2cae55f202981982e36f2aba18efaf Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 10 Jan 2022 11:59:51 +0300 Subject: [PATCH] [DE] Fix undo-redo lock --- apps/common/main/lib/controller/ReviewChanges.js | 1 - apps/common/main/lib/view/ReviewChanges.js | 2 +- apps/documenteditor/main/app/view/Toolbar.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 822fcb2a9f..cc33fcc8b1 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -188,7 +188,6 @@ define([ this.popoverChanges && this.popoverChanges.each(function (model) { model.set('hint', !me.appConfig.canReview); }); - // Common.Utils.lockControls(Common.enumLock.viewMode, this.viewmode, {array: [this.view.btnCompare]}); }, onApiShowChange: function (sdkchange) { diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 22e0137de7..baba014352 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -64,7 +64,7 @@ define([ hasCoeditingUsers: 'has-coediting-users', previewReviewMode: 'preview-review-mode', // display mode on Collaboration tab viewFormMode: 'view-form-mode', // view form mode on Forms tab - viewMode: 'view-mode', // view mode on disconnect, version history etc + viewMode: 'view-mode', // view mode on disconnect, version history etc (used for locking buttons not in toolbar) hideComments: 'hide-comments', // no live comments and left panel is closed cantShare: 'cant-share' }; diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 580c51f47e..c7b8ffdd05 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -213,7 +213,7 @@ define([ id: 'id-toolbar-btn-undo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-undo', - lock: [_set.undoLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.undoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], signals: ['disabled'], dataHint: '1', dataHintDirection: 'bottom', @@ -225,7 +225,7 @@ define([ id: 'id-toolbar-btn-redo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-redo', - lock: [_set.redoLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.redoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], signals: ['disabled'], dataHint: '1', dataHintDirection: 'bottom',