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

Merge pull request #5436 from stevekinney/refactor-parse-args-in-dialog

Browse source 
Refactor parseArgs function in dialog module
This commit is contained in:
Cheng Zhao 2016-05-08 11:57:02 +09:00
commit 1dcbd352cc
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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