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

[DE PE SSE] Fix search

Browse source
This commit is contained in:
JuliaSvinareva 2022-04-12 17:08:08 +03:00
parent cf2068b7cd
commit c9c77487b7
11 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/view/Header.js
View file

@ -356,6 +356,10 @@ define([
if ( me.btnOptions )
me.btnOptions.updateHint(me.tipViewSettings);
if (me.btnSearch)
me.btnSearch.updateHint(me.tipSearch + Common.Utils.String.platformKey('Ctrl+F'));
}
function onFocusDocName(e){
@ -870,7 +874,8 @@ define([
tipViewSettings: 'View Settings',
textRemoveFavorite: 'Remove from Favorites',
textAddFavorite: 'Mark as favorite',
textHideNotes: 'Hide Notes'
textHideNotes: 'Hide Notes',
tipSearch: 'Search'
}
}(), Common.Views.Header || {}))
});

11
apps/common/main/lib/view/SearchPanel.js
View file

@ -86,13 +86,11 @@ define([
style: 'width: 100%;'
});
this.$reaultsNumber = $('#search-adv-results-number');
this.updateResultsNumber('no-results');
this.btnBack = new Common.UI.Button({
parentEl: $('#search-adv-back'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-arrow-up',
hint: this.tipPreviousResult,
dataHint: '1',
dataHintDirection: 'bottom'
});
@ -102,6 +100,7 @@ define([
parentEl: $('#search-adv-next'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-arrow-down',
hint: this.tipNextResult,
dataHint: '1',
dataHintDirection: 'bottom'
});
@ -117,6 +116,9 @@ define([
});
this.btnReplaceAll.on('click', _.bind(this.onReplaceClick, this, 'replaceall'));
this.$reaultsNumber = $('#search-adv-results-number');
this.updateResultsNumber('no-results');
this.chCaseSensitive = new Common.UI.CheckBox({
el: $('#search-adv-case-sensitive'),
labelText: this.textCaseSensitive,
@ -310,6 +312,7 @@ define([
text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
}
this.$reaultsNumber.text(text);
this.disableReplaceButtons(!count);
},
onClickClosePanel: function() {
@ -387,6 +390,8 @@ define([
textNoSearchResults: 'No search results',
textItemEntireCell: 'Entire cell contents',
textTooManyResults: 'There are too many results to show here',
tipPreviousResult: 'Previous result',
tipNextResult: 'Next result',
textName: 'Name',
textCell: 'Cell',
textValue: 'Value',

1
apps/common/main/resources/less/searchdialog.less
View file

@ -221,6 +221,7 @@
.item {
padding: 6px 15px;
word-break: break-all;
cursor: pointer;
&:hover {
background-color: @highlight-button-hover-ie;

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

@ -121,6 +121,12 @@ define([
this._state.useRegExp = checked;
break;
}
if (this._state.searchText !== '' && this.onQuerySearch()) {
this.hideResults();
clearInterval(this.searchTimer);
this.searchTimer = undefined;
this.api.asc_StartTextAroundSearch();
}
},
onSearchNext: function (type, text, e) {

2
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -108,7 +108,7 @@ define([
this.btnSearchBar = new Common.UI.Button({
action: 'advancedsearch',
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
hint: this.tipSearch,
disabled: true,
enableToggle: true,
toggleGroup: 'leftMenuGroup'

1
apps/documenteditor/main/locale/en.json
View file

@ -296,6 +296,7 @@
"Common.Views.Header.tipViewUsers": "View users and manage document access rights",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.tipSearch": "Search",
"Common.Views.History.textCloseHistory": "Close History",
"Common.Views.History.textHide": "Collapse",
"Common.Views.History.textHideAll": "Hide detailed changes",

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

@ -118,6 +118,12 @@ define([
this._state.useRegExp = checked;
break;
}
if (this._state.searchText !== '' && this.onQuerySearch()) {
this.hideResults();
clearInterval(this.searchTimer);
this.searchTimer = undefined;
this.api.asc_StartTextAroundSearch();
}
},
onSearchNext: function (type, text, e) {

2
apps/presentationeditor/main/app/view/LeftMenu.js
View file

@ -104,7 +104,7 @@ define([
this.btnSearchBar = new Common.UI.Button({
action: 'advancedsearch',
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
hint: this.tipSearch,
disabled: true,
enableToggle: true,
toggleGroup: 'leftMenuGroup'

1
apps/presentationeditor/main/locale/en.json
View file

@ -381,6 +381,7 @@
"Common.Views.Header.tipViewUsers": "View users and manage document access rights",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.tipSearch": "Search",
"Common.Views.History.textCloseHistory": "Close History",
"Common.Views.History.textHide": "Collapse",
"Common.Views.History.textHideAll": "Hide detailed changes",

2
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View file

@ -94,7 +94,7 @@ define([
this.btnSearchBar = new Common.UI.Button({
action: 'advancedsearch',
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
hint: this.tipSearch,
disabled: true,
enableToggle: true,
toggleGroup: 'leftMenuGroup'

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -237,6 +237,7 @@
"Common.Views.Header.tipViewUsers": "View users and manage document access rights",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.tipSearch": "Search",
"Common.Views.History.textCloseHistory": "Close History",
"Common.Views.History.textHide": "Collapse",
"Common.Views.History.textHideAll": "Hide detailed changes",