diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-02-09 01:17:11 -0800 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-02-09 01:17:11 -0800 |
| commit | 39183255205cd07028296f82da04d0fae19d3248 (patch) | |
| tree | a8ebdee74a356173902e7a22a808623168f2e799 /apps/files | |
| parent | e5c05e9674a982a88e5e6bb5fe85416e04b872fe (diff) | |
| parent | ce8fc20e0b4afa926eff7151abfe5a969c276b6f (diff) | |
| download | nextcloud-server-39183255205cd07028296f82da04d0fae19d3248.tar.gz nextcloud-server-39183255205cd07028296f82da04d0fae19d3248.zip | |
Merge pull request #1541 from owncloud/fixing-1540-master
remove undefined function FileList.finishDelete
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 72b353b48c2..9c794d24e4f 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -321,7 +321,6 @@ $(document).ready(function(){ // Delete the new uploaded file FileList.deleteCanceled = false; FileList.deleteFiles = [FileList.replaceOldName]; - FileList.finishDelete(null, true); } else { $('tr').filterAttr('data-file', FileList.replaceOldName).show(); } @@ -348,7 +347,6 @@ $(document).ready(function(){ if ($('#notification').data('isNewFile')) { FileList.deleteCanceled = false; FileList.deleteFiles = [$('#notification').data('oldName')]; - FileList.finishDelete(null, true); } }); FileList.useUndo=(window.onbeforeunload)?true:false; diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 7c377afc620..5c5b430a8d4 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -262,12 +262,6 @@ $(document).ready(function() { return; } 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()){ |