From ec831ded6ad2cd2f7d3ee693ab61fe5d29e05a2d Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 9 Mar 2022 17:40:50 +0300 Subject: [PATCH] [DE PE SSE] Make new search: hide search window when open search panel --- apps/documenteditor/main/app/controller/LeftMenu.js | 5 +++++ apps/presentationeditor/main/app/controller/LeftMenu.js | 5 +++++ apps/spreadsheeteditor/main/app/controller/LeftMenu.js | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index c9020ccd8..5f30ed3e7 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -957,6 +957,11 @@ define([ }, onShowAfterSearch: function (findText) { + var viewport = this.getApplication().getController('Viewport'); + if (viewport.isSearchBarVisible()) { + viewport.searchBar.hide(); + } + var text = findText || this.api.asc_GetSelectedText(); if (text) { this.leftMenu.panelSearch.setFindText(text); diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 8d95869a1..a2538ec14 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -812,6 +812,11 @@ define([ }, onShowAfterSearch: function (findText) { + var viewport = this.getApplication().getController('Viewport'); + if (viewport.isSearchBarVisible()) { + viewport.searchBar.hide(); + } + var text = findText || this.api.asc_GetSelectedText(); if (text) { this.leftMenu.panelSearch.setFindText(text); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 84be46512..a9a17a479 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -66,7 +66,8 @@ define([ 'file:show': _.bind(this.fileShowHide, this, true), 'file:hide': _.bind(this.fileShowHide, this, false), 'comments:show': _.bind(this.commentsShowHide, this, true), - 'comments:hide': _.bind(this.commentsShowHide, this, false) + 'comments:hide': _.bind(this.commentsShowHide, this, false), + 'search:aftershow': _.bind(this.onShowAfterSearch, this) }, 'Common.Views.About': { 'show': _.bind(this.aboutShowHide, this, true), @@ -1019,6 +1020,11 @@ define([ }, onShowAfterSearch: function (findText) { + var viewport = this.getApplication().getController('Viewport'); + if (viewport.isSearchBarVisible()) { + viewport.searchBar.hide(); + } + var text = findText || this.api.asc_GetSelectedText(); if (text) { this.leftMenu.panelSearch.setFindText(text);