github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 18:11:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dh-expose-updates

Browse Source
This commit is contained in:
Katrina Uychaco
2016-02-18 23:50:27 -08:00
committed by Ben Ogle
parent adc086d485
commit 3e29cd5762
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/browser/atom-application.coffee
View File

@@ -307,6 +307,9 @@ class AtomApplication
ipcMain.on 'check-for-update', =>
@autoUpdateManager.check()
ipcMain.on 'execute-javascript-in-dev-tools', (event, code) ->
event.sender.devToolsWebContents?.executeJavaScript(code)
setupDockMenu: ->
if process.platform is 'darwin'
dockMenu = Menu.buildFromTemplate [