github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: set cancelId to 1 when defaultId == 0 and no 'cancel' button (#17123)

Browse Source
This commit is contained in:
Samuel Attard
2019-02-27 00:24:13 -08:00
committed by Shelley Vohr
parent 42aa375497
commit 08066581b0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/browser/api/dialog.js
View File

@@ -263,7 +263,8 @@ module.exports = {
// Choose a default button to get selected when dialog is cancelled.
if (cancelId == null) {
cancelId = 0
// If the defaultId is set to 0, ensure the cancel button is a different index (1)
cancelId = (defaultId === 0 && buttons.length > 1) ? 1 : 0
for (let i = 0; i < buttons.length; i++) {
const text = buttons[i].toLowerCase()
if (text === 'cancel' || text === 'no') {