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

Merge pull request #1919 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-08-29 21:12:34 +03:00 committed by GitHub
parent b3553013cf b4977d2a97
commit cdbcfb4e24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/spreadsheeteditor/embed/js/SearchBar.js
View file

@ -58,6 +58,7 @@
api = appApi; api = appApi;
if (api) { if (api) {
api.asc_registerCallback('asc_onSetSearchCurrent', onApiUpdateSearchCurrent); api.asc_registerCallback('asc_onSetSearchCurrent', onApiUpdateSearchCurrent);
api.asc_registerCallback('asc_onActiveSheetChanged', onActiveSheetChanged);
} }
}; };
@ -117,7 +118,7 @@
if ((new Date()) - _lastInputChange < 400) return; if ((new Date()) - _lastInputChange < 400) return;
_state.searchText = _state.newSearchText; _state.searchText = _state.newSearchText;
(_state.newSearchText !== '') && onQuerySearch(); onQuerySearch();
clearInterval(_searchTimer); clearInterval(_searchTimer);
_searchTimer = undefined; _searchTimer = undefined;
}, 10); }, 10);
@ -125,7 +126,7 @@
} }
}; };
var onQuerySearch = function (d, w) { var onQuerySearch = function (d, isNeedRecalc) {
var options = new Asc.asc_CFindOptions(); var options = new Asc.asc_CFindOptions();
options.asc_setFindWhat(_state.searchText); options.asc_setFindWhat(_state.searchText);
options.asc_setScanForward(d != 'back'); options.asc_setScanForward(d != 'back');
@ -134,6 +135,8 @@
options.asc_setScanOnOnlySheet(Asc.c_oAscSearchBy.Sheet); options.asc_setScanOnOnlySheet(Asc.c_oAscSearchBy.Sheet);
options.asc_setScanByRows(true); options.asc_setScanByRows(true);
options.asc_setLookIn(Asc.c_oAscFindLookIn.Formulas); options.asc_setLookIn(Asc.c_oAscFindLookIn.Formulas);
options.asc_setNeedRecalc(isNeedRecalc);
options.asc_setNotSearchEmptyCells(true);
if (!api.asc_findText(options)) { if (!api.asc_findText(options)) {
common.view.SearchBar.disableNavButtons(); common.view.SearchBar.disableNavButtons();
return false; return false;
@ -142,7 +145,7 @@
}; };
var onSearchNext = function (type, text, e) { var onSearchNext = function (type, text, e) {
if (text && text.length > 0 && (type === 'keydown' && e.keyCode === 13 || type !== 'keydown')) { if (type === 'keydown' && e.keyCode === 13 || type !== 'keydown') {
_state.searchText = text; _state.searchText = text;
if (onQuerySearch(type) && _searchTimer) { if (onQuerySearch(type) && _searchTimer) {
clearInterval(_searchTimer); clearInterval(_searchTimer);
@ -162,6 +165,10 @@
} }
}; };
var onActiveSheetChanged = function () {
onQuerySearch(undefined, true);
};
return { return {
init: function(config) { appConfig = config; }, init: function(config) { appConfig = config; },
setApi: setApi, setApi: setApi,