diff options
| author | Peter Grassberger <petertheone@gmail.com> | 2016-06-27 23:12:39 (GMT) |
|---|---|---|
| committer | Peter Grassberger <petertheone@gmail.com> | 2016-06-27 23:12:39 (GMT) |
| commit | 7f14cd762b6a3381c5f3f926ed68c3c0e8cdf4d2 (patch) | |
| tree | f820a8c710faafc57ed211ed34d2b4cb67c922eb /www/js/utils.js | |
| parent | d5d29c8889a9dc655044a1cf0926c1ac892b6696 (diff) | |
| parent | c208d100066d87c39ae5fa1287955998e10d5154 (diff) | |
Merge branch 'websocket'
# Conflicts:
# build.sh
Diffstat (limited to 'www/js/utils.js')
| -rw-r--r-- | www/js/utils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/utils.js b/www/js/utils.js index 7e7a656..8337c12 100644 --- a/www/js/utils.js +++ b/www/js/utils.js @@ -146,8 +146,8 @@ jQuery.fn.sort = function() { }; function updateProgressBar($el, upload) { - if(upload.uploadprogress.progress < 99) { - var bytes_str = Number((upload.uploadprogress.bytesSent/1024)/1024).toFixed(1) + " von " + + if(upload.uploadprogress.progress_step < 2) { + var bytes_str = Number((upload.uploadprogress.current/1024)/1024).toFixed(1) + " von " + Number((upload.uploadprogress.total/1024)/1024).toFixed(1) + " MB"; $el.find('.file-bytes').text(bytes_str); $el.find('.progress .progress-bar').css("width", upload.uploadprogress.progress + "%"); |