diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 04:42:50 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 04:42:50 -0700 |
| commit | 5a037071840b49efc7f0597c28784d8febe3f1f3 (patch) | |
| tree | f737cf9efe8dced98fe2866c59e18c03745099c4 /apps/files/js | |
| parent | 9843c8e83871475e432434d290aa6c89892f8b7b (diff) | |
| parent | 3eed060ec9f680aed4b254f018d832ade5f873c7 (diff) | |
| download | nextcloud-server-5a037071840b49efc7f0597c28784d8febe3f1f3.tar.gz nextcloud-server-5a037071840b49efc7f0597c28784d8febe3f1f3.zip | |
Merge pull request #4601 from owncloud/fixing-4341-master
backport of #4357 to master
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index f262f11f065..1e6ab74fb6d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -102,6 +102,18 @@ $(document).ready(function() { var result=$.parseJSON(response); if(typeof result[0] !== 'undefined' && result[0].status === 'success') { + var filename = result[0].originalname; + + // delete jqXHR reference + if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') { + var dirName = data.context.data('file'); + delete uploadingFiles[dirName][filename]; + if ($.assocArraySize(uploadingFiles[dirName]) == 0) { + delete uploadingFiles[dirName]; + } + } else { + delete uploadingFiles[filename]; + } var file = result[0]; } else { data.textStatus = 'servererror'; @@ -109,20 +121,6 @@ $(document).ready(function() { var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } - - var filename = result[0].originalname; - - // delete jqXHR reference - if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') { - var dirName = data.context.data('file'); - delete uploadingFiles[dirName][filename]; - if ($.assocArraySize(uploadingFiles[dirName]) == 0) { - delete uploadingFiles[dirName]; - } - } else { - delete uploadingFiles[filename]; - } - }, /** * called after last upload |