diff --git a/apps/files_trashbin/js/files_trashbin.js b/apps/files_trashbin/js/files_trashbin.js index 7a83c5790587eb4ddbe60b8895c8d7460aacc79c..17e5e5f754f6de2af278ae388e43c42d99812fa8 100644 Binary files a/apps/files_trashbin/js/files_trashbin.js and b/apps/files_trashbin/js/files_trashbin.js differ diff --git a/apps/files_trashbin/js/files_trashbin.js.map b/apps/files_trashbin/js/files_trashbin.js.map index c9160e5a591164b237ff8e65b38647058e026579..0987efc30247b56c8d9ff4684a326b72e511806b 100644 Binary files a/apps/files_trashbin/js/files_trashbin.js.map and b/apps/files_trashbin/js/files_trashbin.js.map differ diff --git a/apps/files_trashbin/src/filelist.js b/apps/files_trashbin/src/filelist.js index 8912789e752cfd7428719bd2f1e128657eb270c0..4e7f08178024ff3e3ad7d57ceb92bd087b509b70 100644 --- a/apps/files_trashbin/src/filelist.js +++ b/apps/files_trashbin/src/filelist.js @@ -71,7 +71,9 @@ var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments) 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 * and convert files with ".d" extensions to a more diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js index a56ee987b78db5ddffb32884b215b3855d3cf393..11ba49c487ee3ebc209fbeeeded0a82595b24e79 100644 --- a/apps/files_trashbin/tests/js/filelistSpec.js +++ b/apps/files_trashbin/tests/js/filelistSpec.js @@ -129,7 +129,7 @@ describe('OCA.Trashbin.FileList tests', function () { describe('Initialization', function () { it('Sorts by mtime by default', function () { expect(fileList._sort).toEqual('mtime'); - expect(fileList._sortDirection).toEqual('desc'); + expect(fileList._sortDirection).toEqual('asc'); }); it('Always returns read and delete permission', function () { expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);