github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into global-find

Browse Source 
Conflicts:
	src/app/buffer.coffee
This commit is contained in:
Nathan Sobo
2012-07-20 19:01:38 -06:00
parent d16328c533 830935cdb8
commit c05fa7dc6f
9 changed files with 87 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/extensions/command-panel/command-panel.coffee
View File

@@ -58,6 +58,7 @@ class CommandPanel extends View
toggle: ->
if @parent().length then @detach() else @attach()
false
attach: (text='') ->
@rootView.append(this)

6
src/extensions/command-panel/keymap.coffee
View File

@@ -1,7 +1,11 @@
window.keymap.bindKeys '*'
'ctrl-0': 'command-panel:toggle'
'ctrl-meta-0': 'command-panel:toggle-preview'
'meta-:': 'command-panel:toggle'
'meta-F': 'command-panel:find-in-project'
window.keymap.bindKeys '.command-panel .editor',
window.keymap.bindKeys '.command-panel .editor input',
'meta-w': 'command-panel:toggle'
escape: 'command-panel:toggle'
enter: 'command-panel:execute'