diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-08-23 19:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 19:16:50 +0200 |
| commit | 81acf70bcac96e8d735eb70d42d25a6482e73552 (patch) | |
| tree | ccf472ee5cf63c862155d2794ca79c2c36b5897f | |
| parent | 4cf7c351eaf3afec47c51b1776c3ff9cc3c7da3b (diff) | |
| parent | 47f87bbf8c66399d6f87fb8100c60e020840fa9f (diff) | |
| download | nextcloud-server-81acf70bcac96e8d735eb70d42d25a6482e73552.tar.gz nextcloud-server-81acf70bcac96e8d735eb70d42d25a6482e73552.zip | |
Merge pull request #6240 from nextcloud/12-6239
[stable12] Show "Uploading..." in web UI for long uploads
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 2fa3122a008..11365a310ed 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1021,6 +1021,10 @@ OC.Uploader.prototype = _.extend({ } var h = moment.duration(smoothRemainingSeconds, "seconds").humanize(); + if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) { + // show "Uploading ..." for durations longer than 4 hours + h = t('files', 'Uploading...'); + } $('#uploadprogressbar .label .mobile').text(h); $('#uploadprogressbar .label .desktop').text(h); $('#uploadprogressbar').attr('original-title', |