Browse Source

Merge pull request #23286 from nextcloud/design/deleted-sorting

Sort deleted files by most recently deleted first
tags/v21.0.0beta1
Morris Jobke 3 years ago
parent
commit
0c67de3109
No account linked to committer's email address

+ 1
- 1
apps/files_trashbin/js/files_trashbin.js
File diff suppressed because it is too large
View File


+ 1
- 1
apps/files_trashbin/js/files_trashbin.js.map
File diff suppressed because it is too large
View File


+ 3
- 1
apps/files_trashbin/src/filelist.js View File

var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments) var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments)
this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this)) this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this))


this.setSort('mtime', 'desc')
// Sort by most recently deleted first
this.setSort('mtime', 'asc')

/** /**
* Override crumb making to add "Deleted Files" entry * Override crumb making to add "Deleted Files" entry
* and convert files with ".d" extensions to a more * and convert files with ".d" extensions to a more

+ 1
- 1
apps/files_trashbin/tests/js/filelistSpec.js View File

describe('Initialization', function () { describe('Initialization', function () {
it('Sorts by mtime by default', function () { it('Sorts by mtime by default', function () {
expect(fileList._sort).toEqual('mtime'); expect(fileList._sort).toEqual('mtime');
expect(fileList._sortDirection).toEqual('desc');
expect(fileList._sortDirection).toEqual('asc');
}); });
it('Always returns read and delete permission', function () { it('Always returns read and delete permission', function () {
expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE); expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);

Loading…
Cancel
Save