aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-12-18 06:03:50 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-12-18 06:03:50 -0800
commit277ae281718febddd82846ebbdf7ec3c6380bc07 (patch)
treefeebe2d043f8b264397cde727709dfdbff9ee29d /apps/files/js
parenta90342b78117967388db462fec2dc7fd70edc0fa (diff)
parent335b2f40a631f7188ab921d69289acaf31908c6e (diff)
downloadnextcloud-server-277ae281718febddd82846ebbdf7ec3c6380bc07.tar.gz
nextcloud-server-277ae281718febddd82846ebbdf7ec3c6380bc07.zip
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/file-upload.js7
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;
}