Browse Source

Cleanup and fix trashbin "clear all files" operation

tags/v7.0.0alpha2
Vincent Petry 10 years ago
parent
commit
3c006a5a4d
2 changed files with 2 additions and 6 deletions
  1. 1
    5
      apps/files/js/filelist.js
  2. 1
    1
      apps/files_trashbin/js/filelist.js

+ 1
- 5
apps/files/js/filelist.js View File

@@ -26,7 +26,6 @@ window.FileList = {

// number of files per page
pageSize: 20,
totalPages: 0,

/**
* Array of files in the current folder.
@@ -358,8 +357,6 @@ window.FileList = {
return;
}

this.pageNumber++;

while (count > 0 && index < this.files.length) {
fileData = this.files[index];
tr = this._renderRow(fileData, {updateSummary: false});
@@ -394,8 +391,6 @@ window.FileList = {
setFiles: function(filesArray) {
// detach to make adding multiple rows faster
this.files = filesArray;
this.pageNumber = -1;
this.totalPages = Math.ceil(filesArray.length / this.pageSize);

this.$fileList.detach();
this.$fileList.empty();
@@ -847,6 +842,7 @@ window.FileList = {
if (this._selectedFiles[fileEl.data('id')]) {
// remove from selection first
this._selectFileEl(fileEl, false);
this.updateSelectionSummary();
}
if (fileEl.data('permissions') & OC.PERMISSION_DELETE) {
// file is only draggable when delete permissions are set

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

@@ -133,7 +133,7 @@
}
FileList.hideMask();
// simply remove all files
FileList.update('');
FileList.setFiles([]);
enableActions();
}
else {

Loading…
Cancel
Save