diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-11-08 05:36:13 -0800 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-11-08 05:36:13 -0800 |
| commit | edcf1912b93aa22b49bcf727285b8d84998537bc (patch) | |
| tree | f00bf9785cc6fcf585af789c0a96262e77c10fdd | |
| parent | 4459d964d6af1f9a1c12e3132b8609fc0f40dc98 (diff) | |
| parent | c16fbbf386f241d409ff2dd35bc2f1fec5e0c0de (diff) | |
| download | nextcloud-server-edcf1912b93aa22b49bcf727285b8d84998537bc.tar.gz nextcloud-server-edcf1912b93aa22b49bcf727285b8d84998537bc.zip | |
Merge pull request #5762 from owncloud/files-uploaderrordelay
Increased upload error delay to 10 seconds
| -rw-r--r-- | apps/files/js/file-upload.js | 11 |
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); }, |