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

Add option to normalize dialog access keys

Browse source
This commit is contained in:
Kevin Sawicki 2016-12-29 12:05:58 -08:00
parent 0e5fc9c4e4
commit eb533e04b9
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/browser/api/dialog.js
View file

@ -38,6 +38,29 @@ const parseArgs = function (window, options, callback, ...args) {
return [window, options, callback]
}
const normalizeAccessKey = (text) => {
if (typeof text !== 'string') return text
// macOS does not have access keys so remove single ampersands
// and replace double ampersands with a single ampersand
if (process.platform === 'darwin') {
return text.replace(/&(&?)/g, '$1')
}
// Linux uses a single underscore as an access key prefix so escape
// existing single underscores with a second underscore, replace double
// ampersands with a single ampersand, and replace a single ampersand with
// a single underscore
if (process.platform === 'linux') {
return text.replace(/_/g, '__').replace(/&(.?)/g, (match, after) => {
if (after === '&') return after
return `_${after}`
})
}
return text
}
const checkAppInitialized = function () {
if (!app.isReady()) {
throw new Error('dialog module can only be used after app is ready')
@ -154,7 +177,7 @@ module.exports = {
}
}
let {buttons, cancelId, defaultId, detail, icon, message, title, type} = options
let {buttons, cancelId, defaultId, detail, icon, message, title, type, normalizeAccessKeys} = options
if (type == null) {
type = 'none'
@ -171,6 +194,10 @@ module.exports = {
throw new TypeError('Buttons must be an array')
}
if (normalizeAccessKeys) {
buttons = buttons.map(normalizeAccessKey)
}
if (title == null) {
title = ''
} else if (typeof title !== 'string') {