fix: Make smooth bitrate and remaining upload time work when unset

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Aug 21, 2023 · c87ce4b · c87ce4b
1 parent 0609aee
commit c87ce4b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -1264,10 +1264,10 @@ OC.Uploader.prototype = _.extend({
 					}
 					//console.log('#', ' idx: ',bufferIndex, ' Total: ', bufferTotal, ' remainSeconds: ', remainingSeconds, ' during: ', diffUpdate);
 
-					if (smoothRemainingSeconds === null) {
-						smoothRemainingSeconds = bufferTotal / bufferSize;
-					} else{
+					if (smoothRemainingSeconds) {
 						smoothRemainingSeconds = smoothing * (bufferTotal / bufferSize) + ((1-smoothing) * smoothRemainingSeconds);
+					} else {
+						smoothRemainingSeconds = bufferTotal / bufferSize;
 					}
 
 					if (bufferIndex % 4 === 0) {
@@ -1281,10 +1281,10 @@ OC.Uploader.prototype = _.extend({
 					}
 
 					// smooth bitrate
-					if (smoothBitrate === null) {
-						smoothBitrate = data.bitrate;
-					} else{
+					if (smoothBitrate) {
 						smoothBitrate = smoothing * data.bitrate + ((1-smoothing) * smoothBitrate);
+					} else {
+						smoothBitrate = data.bitrate;
 					}
 
 					self._setProgressBarText(h, h, t('files', '{loadedSize} of {totalSize} ({bitrate})' , {