diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
| commit | b7758d0f8d52b2f9653cfee549558327c00c8e01 (patch) | |
| tree | 309fb713ed25f35f746c59c668521bf9023bc331 /apps/files/js/file-upload.js | |
| parent | 70b6e2161ec654f7049027bf6dc5072c1eda4d5e (diff) | |
| parent | ea6e74ca9546ca95b3a6372c6106cd8ab2ea2ee9 (diff) | |
| download | nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.tar.gz nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.zip | |
Merge master into oc_preview
Diffstat (limited to 'apps/files/js/file-upload.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 191f7ed66bc..3d620c5640b 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 |