From 62fb3bb3ef5f85317dcd6e06f55ef36e3a929640 Mon Sep 17 00:00:00 2001 From: SarthikaDhawan Date: Mon, 6 Mar 2017 16:38:35 +0530 Subject: file-upload.js modified : Remaining upload time corrected Signed-off-by: Morris Jobke --- apps/files/js/file-upload.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) mode change 100644 => 100755 apps/files/js/file-upload.js (limited to 'apps/files/js/file-upload.js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js old mode 100644 new mode 100755 index ad4d03a1bdb..c7e2329eabc --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -960,6 +960,7 @@ OC.Uploader.prototype = _.extend({ var bufferSize = 20; var buffer = []; var bufferIndex = 0; + var bufferIndex2 = 0; var bufferTotal = 0; for(var i = 0; i < bufferSize;i++){ buffer[i] = 0; @@ -1005,8 +1006,16 @@ OC.Uploader.prototype = _.extend({ bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds; buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother bufferIndex = (bufferIndex + 1) % bufferSize; + bufferIndex2 = bufferIndex2++; } - var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds + var smoothRemainingSeconds; + if(bufferIndex2<20) { + smoothRemainingSeconds = bufferTotal / bufferIndex2; + } + else { + smoothRemainingSeconds = bufferTotal / bufferSize; + } + var h = moment.duration(smoothRemainingSeconds, "seconds").humanize(); $('#uploadprogressbar .label .mobile').text(h); $('#uploadprogressbar .label .desktop').text(h); -- cgit v1.2.3 From b6c1f3fc6d36dbff40ce7791297765193cbd128c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 17 Mar 2017 12:59:33 +0100 Subject: Some more hardening Signed-off-by: Joas Schilling --- apps/files/js/file-upload.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) mode change 100755 => 100644 apps/files/js/file-upload.js (limited to 'apps/files/js/file-upload.js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js old mode 100755 new mode 100644 index c7e2329eabc..bfb88bc5d20 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1006,14 +1006,15 @@ OC.Uploader.prototype = _.extend({ bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds; buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother bufferIndex = (bufferIndex + 1) % bufferSize; - bufferIndex2 = bufferIndex2++; + bufferIndex2++; } var smoothRemainingSeconds; - if(bufferIndex2<20) { - smoothRemainingSeconds = bufferTotal / bufferIndex2; - } - else { - smoothRemainingSeconds = bufferTotal / bufferSize; + if (bufferIndex2 > 0 && bufferIndex2 < 20) { + smoothRemainingSeconds = bufferTotal / bufferIndex2; + } else if (bufferSize > 0) { + smoothRemainingSeconds = bufferTotal / bufferSize; + } else { + smoothRemainingSeconds = 1; } var h = moment.duration(smoothRemainingSeconds, "seconds").humanize(); -- cgit v1.2.3