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

[DE PE SSE] Fix search panel after show

Browse source
This commit is contained in:
JuliaSvinareva 2022-05-20 14:03:21 +03:00
parent 614a9fa1cc
commit b68c5a7f0c
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/documenteditor/main/app/controller/Search.js
View file

@ -303,7 +303,7 @@ define([
onApiGetTextAroundSearch: function (data) { onApiGetTextAroundSearch: function (data) {
if (this.view && this._state.isStartedAddingResults) { if (this.view && this._state.isStartedAddingResults) {
if (data.length > 300) return; if (data.length > 300 || !data.length) return;
var me = this; var me = this;
me.resultItems = []; me.resultItems = [];
data.forEach(function (item, ind) { data.forEach(function (item, ind) {
@ -352,7 +352,7 @@ define([
viewport.searchBar.hide(); viewport.searchBar.hide();
} }
var text = findText || this.api.asc_GetSelectedText() || this._state.searchText; var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
if (this.resultItems && this.resultItems.length > 0 && if (this.resultItems && this.resultItems.length > 0 &&
(!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() || (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
this._state.matchCase && text === this.view.inputText.getValue())) { // show old results this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
@ -360,8 +360,9 @@ define([
} }
if (text) { if (text) {
this.view.setFindText(text); this.view.setFindText(text);
} else if (text !== undefined) { } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
this.view.setFindText(''); this.view.setFindText('');
this._state.searchText = undefined;
} }
this.hideResults(); this.hideResults();

7
apps/presentationeditor/main/app/controller/Search.js
View file

@ -272,7 +272,7 @@ define([
onApiGetTextAroundSearch: function (data) { onApiGetTextAroundSearch: function (data) {
if (this.view && this._state.isStartedAddingResults) { if (this.view && this._state.isStartedAddingResults) {
if (data.length > 300) return; if (data.length > 300 || !data.length) return;
var me = this; var me = this;
me.resultItems = []; me.resultItems = [];
data.forEach(function (item, ind) { data.forEach(function (item, ind) {
@ -321,11 +321,12 @@ define([
viewport.searchBar.hide(); viewport.searchBar.hide();
} }
var text = findText || this.api.asc_GetSelectedText() || this._state.searchText; var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
if (text) { if (text) {
this.view.setFindText(text); this.view.setFindText(text);
} else if (text !== undefined) { } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
this.view.setFindText(''); this.view.setFindText('');
this._state.searchText = undefined;
} }
this.hideResults(); this.hideResults();

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

@ -683,7 +683,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', [selectedText]);
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');
@ -840,7 +840,7 @@ define([
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('advancedsearch'); this.leftMenu.showMenu('advancedsearch');
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText); this.leftMenu.fireEvent('search:aftershow', [findText]);
} else { } else {
this.leftMenu.btnSearchBar.toggle(false, true); this.leftMenu.btnSearchBar.toggle(false, true);
this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar); this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);

11
apps/spreadsheeteditor/main/app/controller/Search.js
View file

@ -413,7 +413,7 @@ define([
onApiGetTextAroundSearch: function (data) { // [id, sheet, name, cell, value, formula] onApiGetTextAroundSearch: function (data) { // [id, sheet, name, cell, value, formula]
if (this.view && this._state.isStartedAddingResults) { if (this.view && this._state.isStartedAddingResults) {
if (data.length > 300) return; if (data.length > 300 || !data.length) return;
var me = this, var me = this,
$innerResults = me.view.$resultsContainer.find('.search-items'); $innerResults = me.view.$resultsContainer.find('.search-items');
me.resultItems = []; me.resultItems = [];
@ -474,20 +474,21 @@ define([
viewport.searchBar.hide(); viewport.searchBar.hide();
} }
var text = findText || this.api.asc_GetSelectedText() || this._state.searchText; var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
if (this.resultItems && this.resultItems.length > 0 && if (this.resultItems && this.resultItems.length > 0 &&
(!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() || (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
this._state.matchCase && text === this.view.inputText.getValue())) { // show old results this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
return; return;
} }
if (text && text !== this.view.inputText.getValue()) { if (text) {
this.view.setFindText(text); this.view.setFindText(text);
} else if (text !== undefined) { } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
this.view.setFindText(''); this.view.setFindText('');
this._state.searchText = undefined;
} }
this.hideResults(); this.hideResults();
if (text !== '') { // search was made if (text !== '' && text === this._state.searchText) { // search was made
this.view.disableReplaceButtons(false); this.view.disableReplaceButtons(false);
this.api.asc_StartTextAroundSearch(); this.api.asc_StartTextAroundSearch();
} else if (text !== '') { // search wasn't made } else if (text !== '') { // search wasn't made