diff options
| author | tomneedham <tom@owncloud.com> | 2014-01-04 13:46:08 +0000 |
|---|---|---|
| committer | tomneedham <tom@owncloud.com> | 2014-01-04 13:46:08 +0000 |
| commit | 1824ae12225a32d29d5738215f169c1aa3534e8b (patch) | |
| tree | 328c3f3c8cf9819174872d687c3d3a00dd0040ca /apps/files/js | |
| parent | ac85dea267261a58ae815c257098a3ae6ed42b80 (diff) | |
| parent | aaa48576eec42388bc923a60aeb9c92ef2ff9ca4 (diff) | |
| download | nextcloud-server-1824ae12225a32d29d5738215f169c1aa3534e8b.tar.gz nextcloud-server-1824ae12225a32d29d5738215f169c1aa3534e8b.zip | |
Merge branch 'master' into fix-5388-master
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index e9663353f74..196817432d5 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -658,7 +658,12 @@ $(document).ready(function() { }); eventSource.listen('error',function(error) { $('#uploadprogressbar').fadeOut(); - alert(error); + var message = (error && error.message) || t('core', 'Error fetching URL'); + OC.Notification.show(message); + //hide notification after 10 sec + setTimeout(function() { + OC.Notification.hide(); + }, 10000); }); break; } |