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

Client side sort for sharing overview 

Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
This commit is contained in:
Vincent Petry 2014-08-15 16:52:41 +02:00
parent 1fff77f5de
commit 3a99f15af2
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,13 @@
*/ */
_sortComparator: null, _sortComparator: null,
/**
* Whether to do a client side sort.
* When false, clicking on a table header will call reload().
* When true, clicking on a table header will simply resort the list.
*/
_clientSideSort: false,
/** /**
* Current directory * Current directory
*/ */
@ -368,17 +375,16 @@
sort = $target.attr('data-sort'); sort = $target.attr('data-sort');
if (sort) { if (sort) {
if (this._sort === sort) { if (this._sort === sort) {
this.setSort(sort, (this._sortDirection === 'desc')?'asc':'desc'); this.setSort(sort, (this._sortDirection === 'desc')?'asc':'desc', true);
} }
else { else {
if ( sort === 'name' ) { //default sorting of name is opposite to size and mtime if ( sort === 'name' ) { //default sorting of name is opposite to size and mtime
this.setSort(sort, 'asc'); this.setSort(sort, 'asc', true);
} }
else { else {
this.setSort(sort, 'desc'); this.setSort(sort, 'desc', true);
} }
} }
this.reload();
} }
}, },
@ -915,8 +921,9 @@
* *
* @param sort sort attribute name * @param sort sort attribute name
* @param direction sort direction, one of "asc" or "desc" * @param direction sort direction, one of "asc" or "desc"
* @param update true to update the list, false otherwise (default)
*/ */
setSort: function(sort, direction) { setSort: function(sort, direction, update) {
var comparator = FileList.Comparators[sort] || FileList.Comparators.name; var comparator = FileList.Comparators[sort] || FileList.Comparators.name;
this._sort = sort; this._sort = sort;
this._sortDirection = (direction === 'desc')?'desc':'asc'; this._sortDirection = (direction === 'desc')?'desc':'asc';
@ -938,6 +945,15 @@
.removeClass(this.SORT_INDICATOR_DESC_CLASS) .removeClass(this.SORT_INDICATOR_DESC_CLASS)
.toggleClass('hidden', false) .toggleClass('hidden', false)
.addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS); .addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS);
if (update) {
if (this._clientSideSort) {
this.files.sort(this._sortComparator);
this.setFiles(this.files);
}
else {
this.reload();
}
}
}, },
/** /**

2
apps/files_sharing/js/sharedfilelist.js
View File

@ -28,6 +28,8 @@
_sharedWithUser: false, _sharedWithUser: false,
_linksOnly: false, _linksOnly: false,
_clientSideSort: true,
initialize: function($el, options) { initialize: function($el, options) {
OCA.Files.FileList.prototype.initialize.apply(this, arguments); OCA.Files.FileList.prototype.initialize.apply(this, arguments);
if (this.initialized) { if (this.initialized) {