Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35

This commit is contained in:
Wliu
2015-11-18 16:11:49 -05:00
13 changed files with 165 additions and 60 deletions

View File

@@ -138,7 +138,7 @@ class ApplicationDelegate
ipc.on('message', outerCallback)
new Disposable ->
ipc.removeEventListener('message', outerCallback)
ipc.removeListener('message', outerCallback)
onUpdateAvailable: (callback) ->
outerCallback = (message, detail) ->
@@ -147,17 +147,17 @@ class ApplicationDelegate
ipc.on('message', outerCallback)
new Disposable ->
ipc.removeEventListener('message', outerCallback)
ipc.removeListener('message', outerCallback)
onApplicationMenuCommand: (callback) ->
ipc.on('command', callback)
new Disposable ->
ipc.removeEventListener('command', callback)
ipc.removeListener('command', callback)
onContextMenuCommand: (callback) ->
ipc.on('context-command', callback)
new Disposable ->
ipc.removeEventListener('context-command', callback)
ipc.removeListener('context-command', callback)
didCancelWindowUnload: ->
ipc.send('did-cancel-window-unload')