diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 08c2844a29..c420e7212a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -275,8 +275,7 @@
if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
this._detailsView = new OCA.Files.DetailsView();
this._detailsView.$el.insertBefore(this.$el);
- // this._detailsView.$el.addClass('disappear');
- this.showDetailsView('/');
+ this._detailsView.$el.addClass('disappear');
}
this._initFileActions(options.fileActions);
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 27c5699778..efaf9968de 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -94,7 +94,7 @@ describe('OCA.Files.FileList tests', function() {
'' +
'Name' +
'' +
- 'Actions' +
+ 'Actions' +
'' +
'
| ' +
' | ' +
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
index 9d1308af3e..c5b1018856 100644
--- a/apps/files_trashbin/tests/js/filelistSpec.js
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -303,7 +303,9 @@ describe('OCA.Trashbin.FileList tests', function() {
});
it('Deletes selected files when "Delete" clicked', function() {
var request;
- $('.selectedActions .filesSelectMenu .delete').click();
+ var $deleteLink = $('.selectedActions .filesSelectMenu .delete');
+ $deleteLink.click();
+ expect($deleteLink.find('.icon-loading-small').length).toEqual(1);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
@@ -323,6 +325,7 @@ describe('OCA.Trashbin.FileList tests', function() {
}
})
);
+ expect($deleteLink.find('.icon-loading-small').length).toEqual(0);
expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
@@ -348,7 +351,9 @@ describe('OCA.Trashbin.FileList tests', function() {
describe('Restore', function() {
it('Restores selected files when "Restore" clicked', function() {
var request;
- $('.selectedActions .filesSelectMenu .restore').click();
+ var $restoreLink = $('.selectedActions .filesSelectMenu .restore');
+ $restoreLink.click();
+ expect($restoreLink.find('.icon-loading-small').length).toEqual(1);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
@@ -368,6 +373,7 @@ describe('OCA.Trashbin.FileList tests', function() {
}
})
);
+ expect($restoreLink.find('.icon-loading-small').length).toEqual(0);
expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);