mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25310 from owncloud/search-preventinfiniteloop 

Prevent infinite loop in search auto-nextpage
This commit is contained in:
Vincent Petry 2016-06-30 17:20:25 +02:00 committed by GitHub
parent 1b9fa4dd5f 5cfbb9624f
commit 22746990e6
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');
},