mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
trop[bot] 2019-02-27 10:10:18 -08:00 committed by Samuel Attard
parent 08d8c16720
commit 36f7974e18
1 changed files with 2 additions and 1 deletions
Show stats 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. // Choose a default button to get selected when dialog is cancelled.
if (cancelId == null) { 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++) { for (let i = 0; i < buttons.length; i++) {
const text = buttons[i].toLowerCase() const text = buttons[i].toLowerCase()
if (text === 'cancel' || text === 'no') { if (text === 'cancel' || text === 'no') {