summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-08 11:22:08 +0100
committerVincent Petry <pvince81@owncloud.com>2013-11-08 11:22:08 +0100
commitc16fbbf386f241d409ff2dd35bc2f1fec5e0c0de (patch)
treef7637e5fa4c29032e1dd3ba3616d23d1113d9821 /apps
parent013444813e106dcc5ed45cb709696d5d6e24e89a (diff)
downloadnextcloud-server-c16fbbf386f241d409ff2dd35bc2f1fec5e0c0de.tar.gz
nextcloud-server-c16fbbf386f241d409ff2dd35bc2f1fec5e0c0de.zip
Increased upload error delay to 10 seconds
Fixes #5662 Also made it use OC.Notification instead of directly access the notification HTML element.
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/file-upload.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 553ca036360..bc1244a1e6e 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -303,16 +303,15 @@ $(document).ready(function() {
OC.Upload.log('fail', e, data);
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
if (data.textStatus === 'abort') {
- $('#notification').text(t('files', 'Upload cancelled.'));
+ OC.Notification.show(t('files', 'Upload cancelled.'));
} else {
// HTTP connection problem
- $('#notification').text(data.errorThrown);
+ OC.Notification.show(data.errorThrown);
}
- $('#notification').fadeIn();
- //hide notification after 5 sec
+ //hide notification after 10 sec
setTimeout(function() {
- $('#notification').fadeOut();
- }, 5000);
+ OC.Notification.hide();
+ }, 10000);
}
OC.Upload.deleteUpload(data);
},