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

[DE PE SSE] Fix bug 58591

Browse source
This commit is contained in:
JuliaSvinareva 2022-08-24 13:29:50 +03:00
parent b3f1a3d677
commit e8ecd37bd6
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -719,7 +719,7 @@ define([
if (this.isSearchPanelVisible()) { if (this.isSearchPanelVisible()) {
selectedText && this.leftMenu.panelSearch.setFindText(selectedText); selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search'); this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText ? selectedText : undefined);
return false; return false;
} else if (this.getApplication().getController('Viewport').isSearchBarVisible()) { } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
var viewport = this.getApplication().getController('Viewport'); var viewport = this.getApplication().getController('Viewport');
@ -735,10 +735,10 @@ define([
Common.NotificationCenter.trigger('search:show'); Common.NotificationCenter.trigger('search:show');
return false; return false;
} else { } else {
this.onShowHideSearch(true, selectedText); this.onShowHideSearch(true, selectedText ? selectedText : undefined);
} }
this.leftMenu.btnSearchBar.toggle(true,true); this.leftMenu.btnSearchBar.toggle(true,true);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search'); this.leftMenu.panelSearch.focus(selectedText ? s : 'search');
// this.leftMenu.menuFile.hide(); // this.leftMenu.menuFile.hide();
return false; return false;
case 'save': case 'save':

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

@ -562,7 +562,7 @@ define([
if (this.isSearchPanelVisible()) { if (this.isSearchPanelVisible()) {
selectedText && this.leftMenu.panelSearch.setFindText(selectedText); selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search'); this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText); this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText ? selectedText : undefined);
return false; return false;
} else if (this.getApplication().getController('Viewport').isSearchBarVisible()) { } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
var viewport = this.getApplication().getController('Viewport'); var viewport = this.getApplication().getController('Viewport');
@ -578,10 +578,10 @@ define([
Common.NotificationCenter.trigger('search:show'); Common.NotificationCenter.trigger('search:show');
return false; return false;
} else { } else {
this.onShowHideSearch(true, selectedText); this.onShowHideSearch(true, selectedText ? selectedText : undefined);
} }
this.leftMenu.btnSearchBar.toggle(true,true); this.leftMenu.btnSearchBar.toggle(true,true);
this.leftMenu.panelSearch.focus(s); this.leftMenu.panelSearch.focus(selectedText ? s : 'search');
} }
return false; return false;
case 'save': case 'save':

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

@ -692,7 +692,7 @@ define([
if (this.isSearchPanelVisible()) { if (this.isSearchPanelVisible()) {
selectedText && this.leftMenu.panelSearch.setFindText(selectedText); selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search'); this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
this.leftMenu.fireEvent('search:aftershow', [selectedText]); this.leftMenu.fireEvent('search:aftershow', [selectedText ? selectedText : undefined]);
return false; return false;
} else if (this.getApplication().getController('Viewport').isSearchBarVisible()) { } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
var viewport = this.getApplication().getController('Viewport'); var viewport = this.getApplication().getController('Viewport');
@ -708,10 +708,10 @@ define([
Common.NotificationCenter.trigger('search:show'); Common.NotificationCenter.trigger('search:show');
return false; return false;
} else { } else {
this.onShowHideSearch(true, selectedText); this.onShowHideSearch(true, selectedText ? selectedText : undefined);
} }
this.leftMenu.btnSearchBar.toggle(true,true); this.leftMenu.btnSearchBar.toggle(true,true);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search'); this.leftMenu.panelSearch.focus(selectedText ? s : 'search');
} }
return false; return false;
case 'save': case 'save':