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:
Nathan Sobo
2012-07-25 13:38:12 -06:00
3 changed files with 8 additions and 3 deletions

View File

@@ -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()