diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-12-19 15:57:04 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-12-19 15:57:04 +0100 |
| commit | 321d96135385cd4b8941ad49555bb7612e5cbddf (patch) | |
| tree | 7cd748eb696804a5057cb9554985e78a87717c4c /apps/files/js | |
| parent | e7a5c90cab3f1afd9c3f81a76c128eced7e94b69 (diff) | |
| parent | ae3df84e207f9bcac1b12923319c18fd80d5252d (diff) | |
| download | nextcloud-server-321d96135385cd4b8941ad49555bb7612e5cbddf.tar.gz nextcloud-server-321d96135385cd4b8941ad49555bb7612e5cbddf.zip | |
Merge branch 'master' into user-no-change-displayname
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; } |