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

fix(GUI): pressing escape cancels modal dialogue (#878)

Browse Source 
Pressing the ESC key in any modal dialogue currently just emits a
message. This change actually cancels the modal, closing it.

Closes: https://github.com/resin-io/etcher/issues/874
Change-Type: patch
Changelog-Entry: Allow the user to press ESC to cancel a modal dialog.
This commit is contained in:
Benedict Aas 2016-11-18 12:55:30 +00:00 committed by Juan Cruz Viotti
parent 938fa71d50
commit e85906d50d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gui/components/modal/services/modal.js
View File

@ -59,10 +59,15 @@ module.exports = function($uibModal, $q) {
.then(resolve)
.catch((error) => {
// Bootstrap doesn't 'resolve' these but cancels the dialog;
// therefore call 'resolve' here applied to 'false'.
if (error === 'escape key press' || error === 'backdrop click') {
resolve(false);
// For some annoying reason, UI Bootstrap Modal rejects
// the result reason if the user clicks on the backdrop
// (e.g: the area surrounding the modal).
if (error !== 'backdrop click') {
} else if (error !== 'backdrop click') {
return reject(error);
}