wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9153 from owncloud/files-unselectafterdelete

Browse source 
Clear file selection when list is repopulated
This commit is contained in:
icewind1991 2014-06-23 14:42:00 +02:00
commit 4d216e8e2a
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/js/filelist.js
View file

@ -512,6 +512,8 @@
this.fileSummary.calculate(filesArray);
this._selectedFiles = {};
this._selectionSummary.clear();
this.updateSelectionSummary();
$(window).scrollTop(0);

34
apps/files/tests/js/filelistSpec.js
View file

@ -1368,7 +1368,8 @@ describe('OCA.Files.FileList tests', function() {
"Content-Type": "application/json"
},
JSON.stringify(data)
]);
]
);
fileList.changeDirectory('/');
fakeServer.respond();
expect($('.select-all').prop('checked')).toEqual(false);
@ -1386,6 +1387,37 @@ describe('OCA.Files.FileList tests', function() {
expect(selectedFiles.length).toEqual(41);
});
describe('clearing the selection', function() {
it('clears selected files selected individually calling setFiles()', function() {
var selectedFiles;
fileList.setFiles(generateFiles(0, 41));
fileList.$fileList.find('tr:eq(5) input:checkbox:first').click();
fileList.$fileList.find('tr:eq(7) input:checkbox:first').click();
selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selectedFiles.length).toEqual(2);
fileList.setFiles(generateFiles(0, 2));
selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selectedFiles.length).toEqual(0);
});
it('clears selected files selected with select all when calling setFiles()', function() {
var selectedFiles;
fileList.setFiles(generateFiles(0, 41));
$('.select-all').click();
selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selectedFiles.length).toEqual(42);
fileList.setFiles(generateFiles(0, 2));
selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selectedFiles.length).toEqual(0);
});
});
describe('Selection overlay', function() {
it('show delete action according to directory permissions', function() {
fileList.setFiles(testFiles);