diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-29 17:47:33 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-29 17:47:33 +0100 |
| commit | e1e4c7c21445d28986c23adf74e67c1c75960ef7 (patch) | |
| tree | 995aec58f32843cf4f4e6d3813d5babbb8978250 /apps/files | |
| parent | 0d7d396d8013d77027d50a6c54350690416d344c (diff) | |
| parent | e08f38f99babcd16701583e789838ccd9376401a (diff) | |
| download | nextcloud-server-e1e4c7c21445d28986c23adf74e67c1c75960ef7.tar.gz nextcloud-server-e1e4c7c21445d28986c23adf74e67c1c75960ef7.zip | |
Merge branch 'master' into fix_file_cache_updater_master
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/file-upload.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 5bf4f5c0981..95c0723f254 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -334,8 +334,13 @@ $(document).ready(function() { var result=$.parseJSON(response); delete data.jqXHR; - - if (typeof result[0] === 'undefined') { + + if (result.status === 'error' && result.data && result.data.message){ + data.textStatus = 'servererror'; + data.errorThrown = result.data.message; + var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); + fu._trigger('fail', e, data); + } else if (typeof result[0] === 'undefined') { data.textStatus = 'servererror'; data.errorThrown = t('files', 'Could not get result from server.'); var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); |