mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Merge branch 'master' of github.com:github/atom into global-find
Conflicts: spec/app/buffer-spec.coffee spec/extensions/command-panel-spec.coffee spec/extensions/tree-view-spec.coffee src/app/buffer.coffee src/extensions/command-panel/command-panel.coffee src/extensions/command-panel/keymap.coffee
This commit is contained in:
@@ -46,6 +46,7 @@ class CommandPanel extends View
|
||||
|
||||
@on 'command-panel:unfocus', => @rootView.focus()
|
||||
@on 'command-panel:close', => @detach()
|
||||
|
||||
@rootView.on 'command-panel:toggle', => @toggle()
|
||||
@rootView.on 'command-panel:toggle-preview', => @togglePreview()
|
||||
@rootView.on 'command-panel:execute', => @execute()
|
||||
|
||||
Reference in New Issue
Block a user