Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE SSE] Don't hide advanced search settings button in searchbar when left panel is not visible

Browse source
This commit is contained in:
JuliaSvinareva 2022-12-01 18:08:07 +03:00
parent ca5738bd99
commit 74e246e032
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -881,6 +881,7 @@ define([
onShowHideSearch: function (state, findText) { onShowHideSearch: function (state, findText) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
this.tryToShowLeftMenu();
this.leftMenu.showMenu('advancedsearch', undefined, true); this.leftMenu.showMenu('advancedsearch', undefined, true);
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
} else { } else {

5
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -283,8 +283,9 @@ define([
return; return;
} }
if (!this.searchBar) { if (!this.searchBar) {
var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); var hideLeftPanel = this.appConfig.canBrandingExt &&
this.searchBar = new Common.UI.SearchBar( !isVisible ? { (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false);
this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? {
showOpenPanel: false, showOpenPanel: false,
width: 303 width: 303
} : {}); } : {});

1
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -717,6 +717,7 @@ define([
onShowHideSearch: function (state, findText) { onShowHideSearch: function (state, findText) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
this.tryToShowLeftMenu();
this.leftMenu.showMenu('advancedsearch', undefined, true); this.leftMenu.showMenu('advancedsearch', undefined, true);
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
} else { } else {

5
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -345,8 +345,9 @@ define([
return; return;
} }
if (!this.searchBar) { if (!this.searchBar) {
var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); var hideLeftPanel = this.appConfig.canBrandingExt &&
this.searchBar = new Common.UI.SearchBar( !isVisible ? { (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false);
this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? {
showOpenPanel: false, showOpenPanel: false,
width: 303 width: 303
} : {}); } : {});

1
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -857,6 +857,7 @@ define([
onShowHideSearch: function (state, findText) { onShowHideSearch: function (state, findText) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
this.tryToShowLeftMenu();
this.leftMenu.showMenu('advancedsearch'); this.leftMenu.showMenu('advancedsearch');
this.leftMenu.fireEvent('search:aftershow', [findText]); this.leftMenu.fireEvent('search:aftershow', [findText]);
} else { } else {

5
apps/spreadsheeteditor/main/app/controller/Viewport.js
View file

@ -311,8 +311,9 @@ define([
return; return;
} }
if (!this.searchBar) { if (!this.searchBar) {
var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible(); var hideLeftPanel = this.appConfig.canBrandingExt &&
this.searchBar = new Common.UI.SearchBar( !isVisible ? { (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false);
this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? {
showOpenPanel: false, showOpenPanel: false,
width: 303 width: 303
} : {}); } : {});