diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js index 6669d8cab8..a41d1fa46e 100644 --- a/lib/browser/api/dialog.js +++ b/lib/browser/api/dialog.js @@ -21,22 +21,20 @@ var messageBoxOptions = { } var parseArgs = function (window, options, callback, ...args) { - if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) { + if (window !== null && window.constructor !== BrowserWindow) { // Shift. - callback = options - options = window - window = null + [callback, options, window] = [options, window, null] } if ((callback == null) && typeof options === 'function') { // Shift. - callback = options - options = null + [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] + var lastArgument = args[args.length - 1] + if ((callback == null) && typeof lastArgument === 'function') { + callback = lastArgument } return [window, options, callback]