From b335314cd2685e7ee74a323e534aa717c7fb9ebb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 11 Jun 2024 13:07:13 +0300 Subject: [PATCH] Fix Bug 68543 --- apps/common/main/lib/component/Mixtbar.js | 1 + .../main/app/controller/FormsTab.js | 18 ++++++++++++------ .../main/app/controller/Toolbar.js | 8 +++++++- apps/pdfeditor/main/app/controller/Toolbar.js | 10 +++++++++- .../main/app/controller/Toolbar.js | 11 ++++++++++- .../main/app/controller/Toolbar.js | 8 +++++++- 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 4e9108f74a..4285c988fd 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -254,6 +254,7 @@ define([ optsFold.$bar.removeClass('expanded'); optsFold.$bar.find('.tabs .ribtab').removeClass('active'); } + this.fireEvent('tab:collapse'); }, expand: function() { diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 5a6d912478..e54e85a21e 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -132,7 +132,11 @@ define([ 'forms:gopage': this.onGotoPage }, 'Toolbar': { - 'tab:active': this.onActiveTab + 'tab:active': this.onActiveTab, + 'tab:collapse': this.onTabCollapse, + 'view:compact' : function (toolbar, state) { + state && me.onTabCollapse(); + }, } }); this.appConfig.isRestrictedEdit && this.api && this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this)); @@ -617,11 +621,13 @@ define([ onActiveTab: function(tab) { - if (tab !== 'forms') { - this.closeHelpTip('create'); - this.closeHelpTip('roles'); - this.closeHelpTip('save'); - } + (tab !== 'forms') && this.onTabCollapse(); + }, + + onTabCollapse: function(tab) { + this.closeHelpTip('create'); + this.closeHelpTip('roles'); + this.closeHelpTip('save'); }, onChangeProtectDocument: function(props) { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index e9501a080f..4c5d3bedcd 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -123,7 +123,8 @@ define([ 'insert:smartart' : this.onInsertSmartArt, 'smartart:mouseenter': this.mouseenterSmartArt, 'smartart:mouseleave': this.mouseleaveSmartArt, - 'tab:active': this.onActiveTab + 'tab:active': this.onActiveTab, + 'tab:collapse': this.onTabCollapse }, 'FileMenu': { 'menu:hide': this.onFileMenu.bind(this, 'hide'), @@ -507,6 +508,7 @@ define([ onChangeCompactView: function(view, compact) { this.toolbar.setFolded(compact); this.toolbar.fireEvent('view:compact', [this, compact]); + compact && this.onTabCollapse(); Common.localStorage.setBool('de-compact-toolbar', compact); Common.NotificationCenter.trigger('layout:changed', 'toolbar'); @@ -3894,6 +3896,10 @@ define([ (tab !== 'home') && Common.UI.TooltipManager.closeTip('docMode'); }, + onTabCollapse: function(tab) { + Common.UI.TooltipManager.closeTip('pageColor'); + }, + textEmptyImgUrl : 'You need to specify image URL.', textWarning : 'Warning', textFontSizeErr : 'The entered value is incorrect.
Please enter a numeric value between 1 and 300', diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js index 43149c8ebe..759cc967c6 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -93,7 +93,8 @@ define([ 'Toolbar': { 'change:compact' : this.onClickChangeCompact, 'home:open' : this.onHomeOpen, - 'tab:active' : this.onActiveTab + 'tab:active' : this.onActiveTab, + 'tab:collapse' : this.onTabCollapse }, 'FileMenu': { 'menu:hide': this.onFileMenu.bind(this, 'hide'), @@ -424,6 +425,8 @@ define([ this.toolbar.setFolded(compact); this.toolbar.fireEvent('view:compact', [this, compact]); + compact && this.onTabCollapse(); + Common.localStorage.setBool('pdfe-compact-toolbar', compact); Common.NotificationCenter.trigger('layout:changed', 'toolbar'); Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -1361,6 +1364,11 @@ define([ (tab === 'comment') ? Common.UI.TooltipManager.showTip('textComment') : Common.UI.TooltipManager.closeTip('textComment'); }, + onTabCollapse: function(tab) { + Common.UI.TooltipManager.closeTip('editPdf'); + Common.UI.TooltipManager.closeTip('textComment'); + }, + applySettings: function() { this.toolbar && this.toolbar.chShowComments && this.toolbar.chShowComments.setValue(Common.Utils.InternalSettings.get("pdfe-settings-livecomment"), true); }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 9c0b86a1ee..db4e5d4456 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -150,7 +150,8 @@ define([ 'insert:placeholder-menu': this.onMenuInsertPlaceholder.bind(this), 'title:hide' : this.onTitleHide.bind(this), 'footers:hide' : this.onFootersHide.bind(this), - 'tab:active' : this.onActiveTab.bind(this) + 'tab:active' : this.onActiveTab.bind(this), + 'tab:collapse' : this.onTabCollapse.bind(this) }, 'DocumentHolder': { 'smartart:mouseenter': this.mouseenterSmartArt, @@ -483,6 +484,8 @@ define([ this.toolbar.setFolded(compact); this.toolbar.fireEvent('view:compact', [this.toolbar, compact]); + compact && this.onTabCollapse(); + Common.localStorage.setBool('pe-compact-toolbar', compact); Common.NotificationCenter.trigger('layout:changed', 'toolbar'); Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -3090,6 +3093,12 @@ define([ (tab === 'view') ? Common.UI.TooltipManager.showTip('masterSlide') : Common.UI.TooltipManager.closeTip('masterSlide'); }, + onTabCollapse: function(tab) { + Common.UI.TooltipManager.closeTip('colorSchema'); + Common.UI.TooltipManager.closeTip('animPane'); + Common.UI.TooltipManager.closeTip('masterSlide'); + }, + textEmptyImgUrl : 'You need to specify image URL.', textWarning : 'Warning', textFontSizeErr : 'The entered value is incorrect.
Please enter a numeric value between 1 and 300', diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 7b7cdac556..679f535d72 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -91,7 +91,8 @@ define([ 'insert:smartart' : this.onInsertSmartArt, 'smartart:mouseenter': this.mouseenterSmartArt, 'smartart:mouseleave': this.mouseleaveSmartArt, - 'tab:active': this.onActiveTab + 'tab:active': this.onActiveTab, + 'tab:collapse': this.onTabCollapse }, 'FileMenu': { 'menu:hide': me.onFileMenu.bind(me, 'hide'), @@ -2209,6 +2210,7 @@ define([ onChangeViewMode: function(item, compact) { this.toolbar.setFolded(compact); this.toolbar.fireEvent('view:compact', [this, compact]); + compact && this.onTabCollapse(); Common.localStorage.setBool('sse-compact-toolbar', compact); Common.NotificationCenter.trigger('layout:changed', 'toolbar'); @@ -5250,6 +5252,10 @@ define([ (tab !== 'home') && Common.UI.TooltipManager.closeTip('quickAccess'); }, + onTabCollapse: function(tab) { + Common.UI.TooltipManager.closeTip('protectRange'); + }, + textEmptyImgUrl : 'You need to specify image URL.', warnMergeLostData : 'Operation can destroy data in the selected cells.
Continue?', textWarning : 'Warning',