diff --git a/Viewer/features/ui-progress.js b/Viewer/features/ui-progress.js index ccfebd22..c1e7327e 100755 --- a/Viewer/features/ui-progress.js +++ b/Viewer/features/ui-progress.js @@ -170,12 +170,10 @@ var ProgressActions = actions.Actions({ : parseInt(value)) : v) } - // XXX REMAINING_TIME var prev = cache.prev || 0 value = cache.prev = updateValue('value', value) max = updateValue('max', max) - // XXX REMAINING_TIME // estimate time to completion... var t0 = cache.timestamp || Date.now() var t = (cache.timestamp = Date.now()) - t0 @@ -186,9 +184,9 @@ var ProgressActions = actions.Actions({ avg > 0 && remaining.setMilliseconds( avg - * (max-value) - // make the estimate a bit pessimistic... - * 1.3) + * (max-value) + // make the estimate a bit pessimistic... + * 1.3) // update not due yet... if('timeout' in cache){ @@ -277,10 +275,10 @@ var ProgressActions = actions.Actions({ timeout && clearTimeout(JSON.parse(timeout)) - //* XXX REMAINING_TIME // time remaining... - var t = remaining ? - ` t:-${ + // NOTE: we show hours only if > 0... + var t = (remaining && remaining.valueOf()) ? + ` / -${ remaining.toISOString() .substr(11, 8) .replace(/^00:/, '') }s`