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

feat(GUI): show "Unmounting..." while unmounting a drive (#618)

Browse Source 
Currently, we show "Finishing..." indenpendently on if we're waiting for
the flash to emit the "done" event, or we're waiting for the drive to be
unmounted.

As a way to simplify things, we move the hairy `ngShow` stack from the
main template to a nice function in the controller.

Change-Type: minor
Changelog-Entry: Show "Unmounting..." while unmounting a drive.
Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-08-03 11:23:22 -04:00 committed by GitHub
parent 98b2cc906f
commit 2c80ca23a7
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/gui/pages/main/controllers/main.js
View File

@ -93,6 +93,32 @@ module.exports = function(
} }
}); });
this.getProgressButtonLabel = () => {
const flashState = this.state.getFlashState();
if (!this.state.isFlashing()) {
return 'Flash!';
}
if (flashState.percentage === 100) {
if (flashState.type === 'check' && this.settings.get('unmountOnSuccess')) {
return 'Unmounting...';
}
return 'Finishing...';
}
if (flashState.percentage === 0) {
return 'Starting...';
}
if (flashState.type === 'check') {
return `${flashState.percentage}% Validating...`;
}
return `${flashState.percentage}%`;
};
this.selectImage = (image) => { this.selectImage = (image) => {
if (!SupportedFormatsModel.isSupportedImage(image.path)) { if (!SupportedFormatsModel.isSupportedImage(image.path)) {
OSDialogService.showError('Invalid image', `${image.path} is not a supported image type.`); OSDialogService.showError('Invalid image', `${image.path} is not a supported image type.`);

8
lib/gui/pages/main/templates/main.tpl.html
View File

@ -90,13 +90,7 @@
ng-show="main.state.wasLastFlashSuccessful()" ng-show="main.state.wasLastFlashSuccessful()"
ng-click="main.flash(main.selection.getImagePath(), main.selection.getDrive())" ng-click="main.flash(main.selection.getImagePath(), main.selection.getDrive())"
ng-disabled="!main.selection.hasImage() || !main.selection.hasDrive()"> ng-disabled="!main.selection.hasImage() || !main.selection.hasDrive()">
<span ng-show="main.state.getFlashState().percentage == 100 && main.state.isFlashing()">Finishing...</span> <span ng-bind="main.getProgressButtonLabel()"></span>
<span ng-show="main.state.getFlashState().percentage == 0 && !main.state.isFlashing()">Flash!</span>
<span ng-show="main.state.getFlashState().percentage == 0 && main.state.isFlashing() && !main.state.getFlashState().speed">Starting...</span>
<span ng-show="main.state.getFlashState().speed && main.state.getFlashState().percentage != 100 && main.state.getFlashState().type != 'check'"
ng-bind="main.state.getFlashState().percentage + '% '"></span>
<span ng-show="main.state.getFlashState().speed && main.state.getFlashState().percentage != 100 && main.state.getFlashState().type == 'check'"
ng-bind="main.state.getFlashState().percentage + '% Validating...'"></span>
</progress-button> </progress-button>
<div class="alert-ribbon alert-warning" ng-class="{ 'alert-ribbon--open': !main.state.wasLastFlashSuccessful() }"> <div class="alert-ribbon alert-warning" ng-class="{ 'alert-ribbon--open': !main.state.wasLastFlashSuccessful() }">