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

Merge pull request #4969 from atom/null-dialog-callback

Browse source 
Add dialog callback fallback
This commit is contained in:
Kevin Sawicki 2016-04-01 16:11:09 -07:00
commit ef08138a8d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,18 +20,25 @@ var messageBoxOptions = {
noLink: 1 << 0 noLink: 1 << 0
} }
var parseArgs = function (window, options, callback) { var parseArgs = function (window, options, callback, ...args) {
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) { if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
// Shift. // Shift.
callback = options callback = options
options = window options = window
window = null window = null
} }
if ((callback == null) && typeof options === 'function') { if ((callback == null) && typeof options === 'function') {
// Shift. // Shift.
callback = options callback = options
options = null options = null
} }
// Fallback to using very last argument as the callback function
if ((callback == null) && typeof args[args.length - 1] === 'function') {
callback = args[args.length - 1]
}
return [window, options, callback] return [window, options, callback]
} }