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

[DE] Search: add selection of results by nav buttons

Browse source
This commit is contained in:
JuliaSvinareva 2022-03-30 21:07:25 +03:00
parent 1ed6a7b830
commit 6f203af127
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -246,10 +246,38 @@ define([
if (this.view) { if (this.view) {
this.view.updateResultsNumber(current, all); this.view.updateResultsNumber(current, all);
this.view.disableNavButtons(current, all); this.view.disableNavButtons(current, all);
if (this.resultItems.length > 0) {
this.resultItems.forEach(function (item) {
item.selected = false;
});
if (this.resultItems[current]) {
this.resultItems[current].selected = true;
$('#search-results').find('.item').removeClass('selected');
$(this.resultItems[current].el).addClass('selected');
this.scrollToSelectedResult(current);
}
}
} }
Common.NotificationCenter.trigger('search:updateresults', current, all); Common.NotificationCenter.trigger('search:updateresults', current, all);
}, },
scrollToSelectedResult: function (ind) {
var index = ind !== undefined ? ind : _.findIndex(this.resultItems, {selected: true});
if (index !== -1) {
var item = this.resultItems[index].$el,
itemHeight = item.outerHeight(),
itemTop = item.position().top,
container = this.view.$resultsContainer,
containerHeight = container.outerHeight(),
containerTop = container.scrollTop();
if (itemTop < 0 || (containerTop === 0 && itemTop > containerHeight)) {
container.scroller.scrollTop(containerTop + itemTop - 12);
} else if (itemTop + itemHeight > containerHeight) {
container.scroller.scrollTop(containerTop + itemHeight);
}
}
},
onStartTextAroundSearch: function () { onStartTextAroundSearch: function () {
if (this.view) { if (this.view) {
this._state.isStartedAddingResults = true; this._state.isStartedAddingResults = true;
@ -268,17 +296,21 @@ define([
if (data.length > 300) return; if (data.length > 300) return;
var me = this; var me = this;
me.resultItems = []; me.resultItems = [];
data.forEach(function (item) { data.forEach(function (item, ind) {
var el = document.createElement("div"); var el = document.createElement("div"),
isSelected = ind === me._state.currentResult;
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), el: el}); if (isSelected) {
$(el).addClass('selected');
}
var resultItem = {id: item[0], $el: $(el), el: el, selected: isSelected};
me.resultItems.push(resultItem);
$(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);
$('#search-results').find('.item').removeClass('selected');
$(el.currentTarget).addClass('selected');
}, me)); }, me));
}); });
@ -338,12 +370,16 @@ define([
this.view.$resultsContainer.show(); this.view.$resultsContainer.show();
this.resultItems.forEach(function (item) { this.resultItems.forEach(function (item) {
me.view.$resultsContainer.append(item.el); me.view.$resultsContainer.append(item.el);
if (item.selected) {
$(item.el).addClass('selected');
}
$(item.el).on('click', function (el) { $(item.el).on('click', function (el) {
me.api.asc_SelectSearchElement(item.id); me.api.asc_SelectSearchElement(item.id);
$('#search-results').find('.item').removeClass('selected'); $('#search-results').find('.item').removeClass('selected');
$(el.currentTarget).addClass('selected'); $(el.currentTarget).addClass('selected');
}); });
}); });
this.scrollToSelectedResult();
} }
}, },