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

Do not assume trailing callback in dialog API, fixes #395.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-15 12:43:28 +08:00
parent bf5fc2db9b
commit 5270eab512
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/api/lib/dialog.coffee
View file

@ -26,11 +26,17 @@ module.exports =
options.title ?= '' options.title ?= ''
options.defaultPath ?= '' options.defaultPath ?= ''
wrappedCallback =
if typeof callback is 'function'
(success, result) -> callback(if success then result)
else
null
binding.showOpenDialog String(options.title), binding.showOpenDialog String(options.title),
String(options.defaultPath), String(options.defaultPath),
properties, properties,
window, window,
(success, result) -> callback if success then result wrappedCallback
showSaveDialog: (window, options, callback) -> showSaveDialog: (window, options, callback) ->
unless window?.constructor is BrowserWindow unless window?.constructor is BrowserWindow
@ -43,10 +49,16 @@ module.exports =
options.title ?= '' options.title ?= ''
options.defaultPath ?= '' options.defaultPath ?= ''
wrappedCallback =
if typeof callback is 'function'
(success, result) -> callback(if success then result)
else
null
binding.showSaveDialog String(options.title), binding.showSaveDialog String(options.title),
String(options.defaultPath), String(options.defaultPath),
window, window,
(success, result) -> callback if success then result wrappedCallback
showMessageBox: (window, options, callback) -> showMessageBox: (window, options, callback) ->
unless window?.constructor is BrowserWindow unless window?.constructor is BrowserWindow