jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 15:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(GUI): incorrect ETA on certain timezones (#545)

Browse Source 
In certain timezones, like India's, the ETA would display very weird
numbers. The problem was that we passed a number of milliseconds to
MomentJS, which created a Date object based on it taking timezones into
consideration.

As a solution, we convert the seconds to a Date object containing the
lowest possible date values, and set its seconds to the ETA, since this
effectively represents just the number of seconds we're interested in.

Changelog-Entry: Fix incorrect ETA numbers in certain timezones.
Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-06-30 12:11:41 -04:00 committed by GitHub
parent a81fdbe16a
commit f277724749
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/gui/app.js
View File

@ -35,6 +35,7 @@ const app = angular.module('Etcher', [
require('angular-moment'),
require('angular-middle-ellipses'),
require('angular-if-state'),
require('angular-seconds-to-date'),
// Etcher modules
require('./modules/drive-scanner'),

5
lib/gui/partials/main.html
View File

@ -112,10 +112,7 @@
</button>
<p class="step-footer step-footer-split" ng-show="app.writer.state.speed && app.writer.state.percentage != 100">
<!-- Convert our eta (in seconds) to milliseconds, which is what `moment` understands -->
<span>ETA: {{ app.writer.state.eta * 1000 | amDateFormat:'m[m]ss[s]' }}</span>
<span>ETA: {{ app.writer.state.eta | secondsToDate | amDateFormat:'m[m]ss[s]' }}</span>
<span ng-bind="app.writer.state.speed.toFixed(2) + ' MB/s'"></span>
</p>
</div>

5
npm-shrinkwrap.json generated
View File

@ -59,6 +59,11 @@
"from": "angular-moment@>=1.0.0-beta.6 <2.0.0",
"resolved": "https://registry.npmjs.org/angular-moment/-/angular-moment-1.0.0-beta.6.tgz"
},
"angular-seconds-to-date": {
"version": "1.0.0",
"from": "angular-seconds-to-date@latest",
"resolved": "https://registry.npmjs.org/angular-seconds-to-date/-/angular-seconds-to-date-1.0.0.tgz"
},
"angular-ui-bootstrap": {
"version": "1.3.3",
"from": "angular-ui-bootstrap@>=1.3.2 <2.0.0",

1
package.json
View File

@ -59,6 +59,7 @@
"angular-if-state": "^1.0.0",
"angular-middle-ellipses": "^1.0.0",
"angular-moment": "^1.0.0-beta.6",
"angular-seconds-to-date": "^1.0.0",
"angular-ui-bootstrap": "^1.3.2",
"angular-ui-router": "^0.2.18",
"bluebird": "^3.0.5",