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

[DE] Fix auto search in left panel, fix search results

Browse source
This commit is contained in:
JuliaSvinareva 2022-03-22 21:41:18 +03:00
parent 25b48c032e
commit c64539f2ab
4 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,6 @@ define([
style: 'width: 100%;' style: 'width: 100%;'
}); });
this.inputText._input.on('input', _.bind(function () { this.inputText._input.on('input', _.bind(function () {
this.disableNavButtons();
this.fireEvent('search:input', [this.inputText._input.val()]); this.fireEvent('search:input', [this.inputText._input.val()]);
}, this)).on('keydown', _.bind(function (e) { }, this)).on('keydown', _.bind(function (e) {
this.fireEvent('search:keydown', [this.inputText._input.val(), e]); this.fireEvent('search:keydown', [this.inputText._input.val(), e]);
@ -232,8 +231,6 @@ define([
show: function () { show: function () {
Common.UI.BaseView.prototype.show.call(this,arguments); Common.UI.BaseView.prototype.show.call(this,arguments);
this.disableNavButtons();
this.fireEvent('show', this ); this.fireEvent('show', this );
this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
@ -277,6 +274,7 @@ define([
onClickClosePanel: function() { onClickClosePanel: function() {
Common.NotificationCenter.trigger('leftmenu:change', 'hide'); Common.NotificationCenter.trigger('leftmenu:change', 'hide');
this.fireEvent('hide', this );
}, },
onBtnNextClick: function (action) { onBtnNextClick: function (action) {

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

@ -802,7 +802,8 @@ define([
var selectedText = this.api.asc_GetSelectedText(); var selectedText = this.api.asc_GetSelectedText();
if (this.isSearchPanelVisible()) { if (this.isSearchPanelVisible()) {
selectedText && this.leftMenu.panelSearch.setFindText(selectedText); selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
this.leftMenu.panelSearch.focus(s); this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
return false; return false;
} else if (this.getApplication().getController('Viewport').isSearchBarVisible()) { } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
if (s === 'replace') { if (s === 'replace') {
@ -820,7 +821,7 @@ define([
this.onShowHideSearch(true, selectedText); this.onShowHideSearch(true, selectedText);
} }
this.leftMenu.btnSearchBar.toggle(true,true); this.leftMenu.btnSearchBar.toggle(true,true);
this.leftMenu.panelSearch.focus(s); this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
// this.leftMenu.menuFile.hide(); // this.leftMenu.menuFile.hide();
return false; return false;
case 'save': case 'save':

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

@ -67,7 +67,9 @@ define([
'search:replaceall': _.bind(this.onQueryReplaceAll, this), 'search:replaceall': _.bind(this.onQueryReplaceAll, this),
'search:input': _.bind(this.onInputSearchChange, this), 'search:input': _.bind(this.onInputSearchChange, this),
'search:options': _.bind(this.onChangeSearchOption, this), 'search:options': _.bind(this.onChangeSearchOption, this),
'search:keydown': _.bind(this.onSearchNext, this, 'keydown') 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onShowPanel, this),
'hide': _.bind(this.onHidePanel, this),
}, },
'LeftMenu': { 'LeftMenu': {
'search:aftershow': _.bind(this.onShowAfterSearch, this) 'search:aftershow': _.bind(this.onShowAfterSearch, this)
@ -165,8 +167,12 @@ define([
searchSettings.put_MatchCase(this._state.matchCase); searchSettings.put_MatchCase(this._state.matchCase);
searchSettings.put_WholeWords(this._state.matchWord); searchSettings.put_WholeWords(this._state.matchWord);
if (!this.api.asc_findText(searchSettings, d != 'back')) { if (!this.api.asc_findText(searchSettings, d != 'back')) {
this.resultItems = [];
this.view.updateResultsNumber(undefined, 0); this.view.updateResultsNumber(undefined, 0);
this.view.disableReplaceButtons(true); this.view.disableReplaceButtons(true);
this._state.currentResult = 0;
this._state.resultsNumber = 0;
this.view.disableNavButtons();
return false; return false;
} }
return true; return true;
@ -193,8 +199,12 @@ define([
searchSettings.put_MatchCase(this._state.matchCase); searchSettings.put_MatchCase(this._state.matchCase);
searchSettings.put_WholeWords(this._state.matchWord); searchSettings.put_WholeWords(this._state.matchWord);
if (!this.api.asc_replaceText(searchSettings, textReplace, false)) { if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
this.resultItems = [];
this.view.updateResultsNumber(undefined, 0); this.view.updateResultsNumber(undefined, 0);
this.view.disableReplaceButtons(true); this.view.disableReplaceButtons(true);
this._state.currentResult = 0;
this._state.resultsNumber = 0;
this.view.disableNavButtons();
} }
} }
}, },
@ -222,13 +232,16 @@ define([
this.api.asc_replaceText(searchSettings, textReplace, true); this.api.asc_replaceText(searchSettings, textReplace, true);
this.hideResults(); this.hideResults();
this.resultItems.length = 0; this.resultItems = [];
} }
}, },
onUpdateSearchCurrent: function (current, all) { onUpdateSearchCurrent: function (current, all) {
this._state.currentResult = current;
this._state.resultsNumber = all;
if (this.view) { if (this.view) {
this.view.updateResultsNumber(current, all); this.view.updateResultsNumber(current, all);
this.view.disableNavButtons(current, all);
} }
Common.NotificationCenter.trigger('search:updateresults', current, all); Common.NotificationCenter.trigger('search:updateresults', current, all);
}, },
@ -256,7 +269,7 @@ define([
el.className = 'item'; el.className = 'item';
el.innerHTML = item[1].trim(); el.innerHTML = item[1].trim();
me.view.$resultsContainer.append(el); me.view.$resultsContainer.append(el);
me.resultItems.push({id: item[0], $el: $(el)}); me.resultItems.push({id: item[0], $el: $(el), el: el});
$(el).on('click', _.bind(function (el) { $(el).on('click', _.bind(function (el) {
var id = item[0]; var id = item[0];
me.api.asc_SelectSearchElement(id); me.api.asc_SelectSearchElement(id);
@ -293,23 +306,43 @@ define([
viewport.searchBar.hide(); viewport.searchBar.hide();
} }
var text = findText || this.api.asc_GetSelectedText(); var text = 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) {
this.view.setFindText(''); this.view.setFindText('');
} }
this.hideResults();
if (text !== '' && text === this._state.searchText) { // search was made if (text !== '' && text === this._state.searchText) { // search was made
this.view.disableReplaceButtons(false); this.view.disableReplaceButtons(false);
this.hideResults();
this.api.asc_StartTextAroundSearch(); this.api.asc_StartTextAroundSearch();
} else if (text !== '') { // search wasn't made
this.onInputSearchChange(text);
} else { } else {
this.resultItems = [];
this.view.disableReplaceButtons(true); this.view.disableReplaceButtons(true);
} }
this.view.disableNavButtons(this._state.currentResult, this._state.resultsNumber);
},
this.view.disableNavButtons(); onShowPanel: function () {
this.view.focus(); if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
var me = this;
this.view.$resultsContainer.show();
this.resultItems.forEach(function (item) {
me.view.$resultsContainer.append(item.el);
$(item.el).on('click', function (el) {
me.api.asc_SelectSearchElement(item.id);
$('#search-results').find('.item').removeClass('selected');
$(el.currentTarget).addClass('selected');
});
});
}
},
onHidePanel: function () {
this.hideResults();
}, },
notcriticalErrorTitle: 'Warning', notcriticalErrorTitle: 'Warning',

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

@ -76,7 +76,10 @@ define([
'click #left-btn-plugins': _.bind(this.onCoauthOptions, this), 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
'click #left-btn-navigation': _.bind(this.onCoauthOptions, this), 'click #left-btn-navigation': _.bind(this.onCoauthOptions, this),
'click #left-btn-thumbnails': _.bind(this.onCoauthOptions, this), 'click #left-btn-thumbnails': _.bind(this.onCoauthOptions, this),
'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this), 'click #left-btn-searchbar': _.bind(function () {
this.onCoauthOptions();
this.fireEvent('search:aftershow', this.leftMenu);
}, this),
'click #left-btn-support': function() { 'click #left-btn-support': function() {
var config = this.mode.customization; var config = this.mode.customization;
config && !!config.feedback && !!config.feedback.url ? config && !!config.feedback && !!config.feedback.url ?
@ -271,6 +274,7 @@ define([
if (this.panelSearch) { if (this.panelSearch) {
if (this.btnSearchBar.pressed) { if (this.btnSearchBar.pressed) {
this.panelSearch.show(); this.panelSearch.show();
this.panelSearch.focus();
} else { } else {
this.panelSearch.hide(); this.panelSearch.hide();
} }
@ -417,6 +421,7 @@ define([
this.btnSearchBar.toggle(true); this.btnSearchBar.toggle(true);
this.onBtnMenuClick(this.btnSearchBar); this.onBtnMenuClick(this.btnSearchBar);
this.onCoauthOptions(); this.onCoauthOptions();
this.panelSearch.focus();
!suspendAfter && this.fireEvent('search:aftershow', this); !suspendAfter && this.fireEvent('search:aftershow', this);
} }
} }