diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 995a75f9d..d18a70fcf 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -881,6 +881,7 @@ define([ onShowHideSearch: function (state, findText) { if (state) { Common.UI.Menu.Manager.hideAll(); + this.tryToShowLeftMenu(); this.leftMenu.showMenu('advancedsearch', undefined, true); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText); } else { diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 713133cde..e63b29eb9 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -283,8 +283,9 @@ define([ return; } if (!this.searchBar) { - var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); - this.searchBar = new Common.UI.SearchBar( !isVisible ? { + var hideLeftPanel = this.appConfig.canBrandingExt && + (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false); + this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? { showOpenPanel: false, width: 303 } : {}); diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index ec114cefa..a98940890 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -717,6 +717,7 @@ define([ onShowHideSearch: function (state, findText) { if (state) { Common.UI.Menu.Manager.hideAll(); + this.tryToShowLeftMenu(); this.leftMenu.showMenu('advancedsearch', undefined, true); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText); } else { diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 50500ed56..4ab619c49 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -345,8 +345,9 @@ define([ return; } if (!this.searchBar) { - var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); - this.searchBar = new Common.UI.SearchBar( !isVisible ? { + var hideLeftPanel = this.appConfig.canBrandingExt && + (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false); + this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? { showOpenPanel: false, width: 303 } : {}); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index be6031ecf..188023360 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -857,6 +857,7 @@ define([ onShowHideSearch: function (state, findText) { if (state) { Common.UI.Menu.Manager.hideAll(); + this.tryToShowLeftMenu(); this.leftMenu.showMenu('advancedsearch'); this.leftMenu.fireEvent('search:aftershow', [findText]); } else { diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 90b38270e..c7f43d4df 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -311,8 +311,9 @@ define([ return; } if (!this.searchBar) { - var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); - this.searchBar = new Common.UI.SearchBar( !isVisible ? { + var hideLeftPanel = this.appConfig.canBrandingExt && + (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false); + this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? { showOpenPanel: false, width: 303 } : {});