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

Merge pull request #25237 from owncloud/search-filelistnextpageresults 

Prerender file list pages to include search results
This commit is contained in:
Vincent Petry 2016-06-27 13:46:25 +02:00 committed by GitHub
parent 72a3301ba4 5e58b5115f
commit 79cfad0cc0
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files/js/filelist.js
View File

@ -2351,22 +2351,36 @@
* @param filter * @param filter
*/ */
setFilter:function(filter) { setFilter:function(filter) {
var total = 0;
this._filter = filter; this._filter = filter;
this.fileSummary.setFilter(filter, this.files); this.fileSummary.setFilter(filter, this.files);
total = this.fileSummary.getTotal();
if (!this.$el.find('.mask').exists()) { if (!this.$el.find('.mask').exists()) {
this.hideIrrelevantUIWhenNoFilesMatch(); this.hideIrrelevantUIWhenNoFilesMatch();
} }
var that = this; var that = this;
var visibleCount = 0;
filter = filter.toLowerCase(); filter = filter.toLowerCase();
this.$fileList.find('tr').each(function(i,e) {
var $e = $(e); function filterRows(tr) {
var $e = $(tr);
if ($e.data('file').toString().toLowerCase().indexOf(filter) === -1) { if ($e.data('file').toString().toLowerCase().indexOf(filter) === -1) {
$e.addClass('hidden'); $e.addClass('hidden');
} else { } else {
visibleCount++;
$e.removeClass('hidden'); $e.removeClass('hidden');
} }
}); }
that.$container.trigger('scroll');
var $trs = this.$fileList.find('tr');
do {
_.each($trs, filterRows);
if (visibleCount < total) {
$trs = this._nextPage(false);
}
} while (visibleCount < total);
this.$container.trigger('scroll');
}, },
hideIrrelevantUIWhenNoFilesMatch:function() { hideIrrelevantUIWhenNoFilesMatch:function() {
if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) { if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) {

11
apps/files/tests/js/filelistSpec.js
View File

@ -989,6 +989,17 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.find('.info').text()).toEqual("1 folder and 3 files"); expect($summary.find('.info').text()).toEqual("1 folder and 3 files");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
}); });
it('filters the list of non-rendered rows using filter()', function() {
var $summary = $('#filestable .summary');
var $nofilterresults = fileList.$el.find(".nofilterresults");
fileList.setFiles(generateFiles(0, 64));
fileList.setFilter('63');
expect($('#fileList tr:not(.hidden)').length).toEqual(1);
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual("0 folders and 1 file matches '63'");
expect($nofilterresults.hasClass('hidden')).toEqual(true);
});
it('hides the emptyfiles notice when using filter()', function() { it('hides the emptyfiles notice when using filter()', function() {
expect(fileList.files.length).toEqual(0); expect(fileList.files.length).toEqual(0);
expect(fileList.files).toEqual([]); expect(fileList.files).toEqual([]);