mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1541 from owncloud/fixing-1540-master 

remove undefined function FileList.finishDelete
This commit is contained in:
Jörn Friedrich Dreyer 2013-02-09 01:17:11 -08:00
parent e5c05e9674 ce8fc20e0b
commit 3918325520
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,6 @@ $(document).ready(function(){
// Delete the new uploaded file // Delete the new uploaded file
FileList.deleteCanceled = false; FileList.deleteCanceled = false;
FileList.deleteFiles = [FileList.replaceOldName]; FileList.deleteFiles = [FileList.replaceOldName];
FileList.finishDelete(null, true);
} else { } else {
$('tr').filterAttr('data-file', FileList.replaceOldName).show(); $('tr').filterAttr('data-file', FileList.replaceOldName).show();
} }
@ -348,7 +347,6 @@ $(document).ready(function(){
if ($('#notification').data('isNewFile')) { if ($('#notification').data('isNewFile')) {
FileList.deleteCanceled = false; FileList.deleteCanceled = false;
FileList.deleteFiles = [$('#notification').data('oldName')]; FileList.deleteFiles = [$('#notification').data('oldName')];
FileList.finishDelete(null, true);
} }
}); });
FileList.useUndo=(window.onbeforeunload)?true:false; FileList.useUndo=(window.onbeforeunload)?true:false;

6
apps/files/js/files.js
View File

@ -262,12 +262,6 @@ $(document).ready(function() {
return; return;
} }
totalSize+=files[i].size; totalSize+=files[i].size;
if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
FileList.finishDelete(function(){
$('#file_upload_start').change();
});
return;
}
} }
} }
if(totalSize>$('#max_upload').val()){ if(totalSize>$('#max_upload').val()){