From 4fcd80a9d9ce0ab3db595a8d632dee4b5f372490 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 24 Jul 2024 15:05:58 +0300 Subject: [PATCH] Bug 65743 --- apps/documenteditor/main/app/controller/Statusbar.js | 9 ++++++++- apps/documenteditor/main/app/controller/Toolbar.js | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 9c6218a2c2..7e39b19cd7 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -133,7 +133,7 @@ define([ if (config.canUseSelectHandTools) { me.statusbar.btnSelectTool.on('click', _.bind(me.onSelectTool, me, 'select')); me.statusbar.btnHandTool.on('click', _.bind(me.onSelectTool, me, 'hand')); - me.statusbar.btnHandTool.toggle(true, true); + me.api.asc_registerCallback('asc_onChangeViewerTargetType', _.bind(me.onChangeViewerTargetType, me)); me.api.asc_setViewerTargetType('hand'); } @@ -358,6 +358,13 @@ define([ } }, + onChangeViewerTargetType: function(isHandMode) { + if (this.statusbar && this.statusbar.btnHandTool) { + this.statusbar.btnHandTool.toggle(isHandMode, true); + this.statusbar.btnSelectTool.toggle(!isHandMode, true); + } + }, + zoomText : 'Zoom {0}%', textHasChanges : 'New changes have been tracked', textTrackChanges: 'The document is opened with the Track Changes mode enabled', diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6ff7d9a505..6d1107d0c2 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -479,7 +479,7 @@ define([ this.api.asc_registerCallback('asc_onCanUndo', _.bind(this.onApiCanRevert, this, 'undo')); this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this)); - + this.api.asc_registerCallback('asc_onChangeViewerTargetType', _.bind(this.onChangeViewerTargetType, this)); } } this.api.asc_registerCallback('onPluginToolbarMenu', _.bind(this.onPluginToolbarMenu, this)); @@ -3693,7 +3693,6 @@ define([ .onAppReady(config); } else if (config.isRestrictedEdit && config.canFillForms && config.isPDFForm) { if (me.toolbar.btnHandTool) { - me.toolbar.btnHandTool.toggle(true, true); me.api.asc_setViewerTargetType('hand'); } } @@ -3869,6 +3868,13 @@ define([ } }, + onChangeViewerTargetType: function(isHandMode) { + if (this.toolbar && this.toolbar.btnHandTool) { + this.toolbar.btnHandTool.toggle(isHandMode, true); + this.toolbar.btnSelectTool.toggle(!isHandMode, true); + } + }, + onPluginToolbarMenu: function(data) { this.toolbar && Array.prototype.push.apply(this.toolbar.lockControls, Common.UI.LayoutManager.addCustomItems(this.toolbar, data)); },