Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added confirmation dialog on app exit #138

Merged
merged 1 commit into from Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/dialog.js
Expand Up @@ -36,6 +36,15 @@ class Dialog {
);
}

_exit() {
return this._create({
buttons: ['Exit', 'Dismiss'],
detail: 'Are you sure you want to exit?',
message: 'Exit Tusk',
title: 'Tusk - Exit Confirmation'
});
}

_signOut() {
return this._create({
buttons: ['Sign Out', 'Dismiss'],
Expand Down Expand Up @@ -69,6 +78,12 @@ class Dialog {
}
}

confirmExit() {
if (this._exit() === 0) {
app.quit();
}
}

confirmRestart() {
if (this._restart() === 0) {
app.quit();
Expand Down
6 changes: 5 additions & 1 deletion src/menu/app.js
@@ -1,5 +1,6 @@
'use strict';
const {app} = require('electron');
const dialog = require('./../dialog');

module.exports = {
label: app.getName(),
Expand All @@ -18,7 +19,10 @@ module.exports = {
}, {
type: 'separator'
}, {
role: 'quit'
label: 'Exit',
click() {
dialog.confirmExit();
}
}
]
};
7 changes: 5 additions & 2 deletions src/menu/file.js
Expand Up @@ -180,8 +180,11 @@ module.exports = {
dialog.confirmSignOut();
}
}, {
role: 'quit',
visible: !is.darwin
label: 'Exit',
visible: !is.darwin,
click() {
dialog.confirmExit();
}
}
]
};
8 changes: 6 additions & 2 deletions src/tray.js
@@ -1,8 +1,9 @@
'use strict';
const {app, Menu, shell, Tray} = require('electron');
const {is} = require('./util');
const settings = require('./settings');
const dialog = require('./dialog');
const file = require('./file');
const settings = require('./settings');
const url = require('./url');
const win = require('./win');

Expand Down Expand Up @@ -101,7 +102,10 @@ function create() {
}, {
type: 'separator'
}, {
role: 'quit'
label: 'Exit',
click() {
dialog.confirmExit();
}
}
]);

Expand Down