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

Remove remaining Promise.then

Browse Source 
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2020-01-15 17:12:27 +01:00
parent 6202393637
commit 2eda6601c0
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/gui/app/app.ts
View File

@ -277,7 +277,7 @@ driveScanner.start();
let popupExists = false; let popupExists = false;
window.addEventListener('beforeunload', event => { window.addEventListener('beforeunload', async event => {
if (!flashState.isFlashing() || popupExists) { if (!flashState.isFlashing() || popupExists) {
analytics.logEvent('Close application', { analytics.logEvent('Close application', {
isFlashing: flashState.isFlashing(), isFlashing: flashState.isFlashing(),
@ -297,33 +297,33 @@ window.addEventListener('beforeunload', event => {
flashingWorkflowUuid, flashingWorkflowUuid,
}); });
osDialog try {
.showWarning({ const confirmed = await osDialog.showWarning({
confirmationLabel: 'Yes, quit', confirmationLabel: 'Yes, quit',
rejectionLabel: 'Cancel', rejectionLabel: 'Cancel',
title: 'Are you sure you want to close Etcher?', title: 'Are you sure you want to close Etcher?',
description: messages.warning.exitWhileFlashing(), description: messages.warning.exitWhileFlashing(),
}) });
.then(confirmed => { if (confirmed) {
if (confirmed) { analytics.logEvent('Close confirmed while flashing', {
analytics.logEvent('Close confirmed while flashing', { flashInstanceUuid: flashState.getFlashUuid(),
flashInstanceUuid: flashState.getFlashUuid(),
applicationSessionUuid,
flashingWorkflowUuid,
});
// This circumvents the 'beforeunload' event unlike
// electron.remote.app.quit() which does not.
electron.remote.process.exit(EXIT_CODES.SUCCESS);
}
analytics.logEvent('Close rejected while flashing', {
applicationSessionUuid, applicationSessionUuid,
flashingWorkflowUuid, flashingWorkflowUuid,
}); });
popupExists = false;
}) // This circumvents the 'beforeunload' event unlike
.catch(exceptionReporter.report); // electron.remote.app.quit() which does not.
electron.remote.process.exit(EXIT_CODES.SUCCESS);
}
analytics.logEvent('Close rejected while flashing', {
applicationSessionUuid,
flashingWorkflowUuid,
});
popupExists = false;
} catch (error) {
exceptionReporter.report(error);
}
}); });
function extendLock() { function extendLock() {

8
lib/shared/utils.ts
View File

@ -58,11 +58,9 @@ export async function getConfig(configUrl: string): Promise<any> {
* @summary returns { path: String, cleanup: Function } * @summary returns { path: String, cleanup: Function }
* *
* @example * @example
* tmpFileAsync() * const {path, cleanup } = await tmpFileAsync()
* .then({ path, cleanup } => { * console.log(path)
* console.log(path) * cleanup()
* cleanup()
* });
*/ */
function tmpFileAsync( function tmpFileAsync(
options: tmp.FileOptions, options: tmp.FileOptions,