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

[DE PE SSE] Fix bug 58193

Browse source
This commit is contained in:
JuliaSvinareva 2022-07-22 17:38:51 +03:00
parent f35f86c5bf
commit 55dda4ad47
6 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -444,6 +444,10 @@ define([
}
},
getSearchText: function () {
return this._state.searchText;
},
notcriticalErrorTitle: 'Warning',
warnReplaceString: '{0} is not a valid special character for the Replace With box.',
textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',

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

@ -293,7 +293,8 @@ define([
}, this));
}
if (this.header.btnSearch.pressed) {
this.searchBar.show(this.api.asc_GetSelectedText());
var selectedText = this.api.asc_GetSelectedText();
this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
} else {
this.searchBar.hide();
}

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

@ -397,6 +397,10 @@ define([
}
},
getSearchText: function () {
return this._state.searchText;
},
notcriticalErrorTitle: 'Warning',
warnReplaceString: '{0} is not a valid special character for the Replace With box.',
textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',

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

@ -355,7 +355,8 @@ define([
}, this));
}
if (this.header.btnSearch.pressed) {
this.searchBar.show(this.api.asc_GetSelectedText());
var selectedText = this.api.asc_GetSelectedText();
this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
} else {
this.searchBar.hide();
}

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

@ -57,7 +57,13 @@ define([
'SearchBar': {
'search:back': _.bind(this.onSearchNext, this, 'back'),
'search:next': _.bind(this.onSearchNext, this, 'next'),
'search:input': _.bind(this.onInputSearchChange, this),
'search:input': _.bind(function (text) {
if (this._state.searchText === text) {
Common.NotificationCenter.trigger('search:updateresults', this._state.currentResult, this._state.resultsNumber);
return;
}
this.onInputSearchChange(text);
}, this),
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onSelectSearchingResults, this, true),
'hide': _.bind(this.onSelectSearchingResults, this, false)
@ -559,6 +565,10 @@ define([
}
},
getSearchText: function () {
return this._state.searchText;
},
textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',

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

@ -321,7 +321,8 @@ define([
}, this));
}
if (this.header.btnSearch.pressed) {
this.searchBar.show(this.api.asc_GetSelectedText());
var selectedText = this.api.asc_GetSelectedText();
this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
} else {
this.searchBar.hide();
}