upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 06:21:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Prevent infinite loop in search auto-nextpage

Browse source 
When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
This commit is contained in:
Vincent Petry 2016-06-30 11:10:48 +02:00
parent 1b9fa4dd5f
commit 5cfbb9624f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files/js/filelist.js
View file

@ -2352,13 +2352,16 @@
*/
setFilter:function(filter) {
var total = 0;
if (this._filter === filter) {
return;
}
this._filter = filter;
this.fileSummary.setFilter(filter, this.files);
total = this.fileSummary.getTotal();
if (!this.$el.find('.mask').exists()) {
this.hideIrrelevantUIWhenNoFilesMatch();
}
var that = this;
var visibleCount = 0;
filter = filter.toLowerCase();
@ -2378,7 +2381,7 @@
if (visibleCount < total) {
$trs = this._nextPage(false);
}
} while (visibleCount < total);
} while (visibleCount < total && $trs.length > 0);
this.$container.trigger('scroll');
},