diff --git a/lib/gui/app.js b/lib/gui/app.js index 3b012988..d470dd80 100644 --- a/lib/gui/app.js +++ b/lib/gui/app.js @@ -106,11 +106,11 @@ app.run((AnalyticsService, OSWindowProgressService, ImageWriterService) => { AnalyticsService.log([ `Progress (${state.flashState.type}):`, - `${state.flashState.progress}% at ${state.flashState.speed} MB/s`, + `${state.flashState.percentage}% at ${state.flashState.speed} MB/s`, `(eta ${state.flashState.eta}s)` ].join(' ')); - OSWindowProgressService.set(state.flashState.progress); + OSWindowProgressService.set(state.flashState.percentage); }); }); diff --git a/lib/gui/models/store.js b/lib/gui/models/store.js index 8a8f62aa..f0d58b12 100644 --- a/lib/gui/models/store.js +++ b/lib/gui/models/store.js @@ -31,7 +31,7 @@ const DEFAULT_STATE = Immutable.fromJS({ selection: {}, isFlashing: false, flashState: { - progress: 0, + percentage: 0, speed: 0 } }); @@ -115,12 +115,12 @@ const storeReducer = (state, action) => { throw new Error(`Invalid state type: ${action.data.type}`); } - if (!action.data.progress) { - throw new Error('Missing state progress'); + if (!action.data.percentage) { + throw new Error('Missing state percentage'); } - if (!_.isNumber(action.data.progress)) { - throw new Error(`Invalid state progress: ${action.data.progress}`); + if (!_.isNumber(action.data.percentage)) { + throw new Error(`Invalid state percentage: ${action.data.percentage}`); } if (!action.data.eta) { diff --git a/lib/gui/modules/image-writer.js b/lib/gui/modules/image-writer.js index 307657f6..4ea2fd8d 100644 --- a/lib/gui/modules/image-writer.js +++ b/lib/gui/modules/image-writer.js @@ -51,7 +51,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel) * @public */ this.state = { - progress: 0, + percentage: 0, speed: 0 }; @@ -128,7 +128,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel) type: Store.Actions.SET_FLASH_STATE, data: { type: state.type, - progress: state.percentage, + percentage: state.percentage, eta: state.eta, // Transform bytes to megabytes preserving only two decimal places diff --git a/lib/gui/partials/main.html b/lib/gui/partials/main.html index ce8d270f..a0e3c2dc 100644 --- a/lib/gui/partials/main.html +++ b/lib/gui/partials/main.html @@ -81,19 +81,19 @@
- Finishing... - Flash! - Starting... - - + Finishing... + Flash! + Starting... + +
@@ -110,7 +110,7 @@ Retry -