github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent b2ad0a05d7 400efa1b7d
commit ef08138a8d
1 changed files with 8 additions and 1 deletions
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
}
var parseArgs = function (window, options, callback) {
var parseArgs = function (window, options, callback, ...args) {
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
// Shift.
callback = options
options = window
window = null
}
if ((callback == null) && typeof options === 'function') {
// Shift.
callback = options
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]
}