From 6c10622b2faa4ac2143d6b7ddedf6b544630824a Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 30 Jan 2013 10:57:44 -0800 Subject: [PATCH 1/2] support escape key to exit command panel --- src/packages/command-panel/src/command-panel-view.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/packages/command-panel/src/command-panel-view.coffee b/src/packages/command-panel/src/command-panel-view.coffee index 7ccb74a48..b297516df 100644 --- a/src/packages/command-panel/src/command-panel-view.coffee +++ b/src/packages/command-panel/src/command-panel-view.coffee @@ -44,6 +44,7 @@ class CommandPanelView extends View @command 'tool-panel:unfocus', => @rootView.focus() @command 'core:close', => @detach(); false + @command 'core:cancel', => @detach(); false @command 'core:confirm', => @execute() @command 'core:move-up', => @navigateBackwardInHistory() @command 'core:move-down', => @navigateForwardInHistory() From 1fa16c4ae125c3c1904cf8a7f23d78aecc837d16 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 30 Jan 2013 13:56:35 -0800 Subject: [PATCH 2/2] refocus preview list after performing operation Allows esc key to exit the command pallete --- src/packages/command-panel/src/command-panel-view.coffee | 1 - src/packages/command-panel/src/preview-list.coffee | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/packages/command-panel/src/command-panel-view.coffee b/src/packages/command-panel/src/command-panel-view.coffee index b297516df..7ccb74a48 100644 --- a/src/packages/command-panel/src/command-panel-view.coffee +++ b/src/packages/command-panel/src/command-panel-view.coffee @@ -44,7 +44,6 @@ class CommandPanelView extends View @command 'tool-panel:unfocus', => @rootView.focus() @command 'core:close', => @detach(); false - @command 'core:cancel', => @detach(); false @command 'core:confirm', => @execute() @command 'core:move-up', => @navigateBackwardInHistory() @command 'core:move-down', => @navigateForwardInHistory() diff --git a/src/packages/command-panel/src/preview-list.coffee b/src/packages/command-panel/src/preview-list.coffee index 34cbd240c..a068da3e2 100644 --- a/src/packages/command-panel/src/preview-list.coffee +++ b/src/packages/command-panel/src/preview-list.coffee @@ -83,7 +83,7 @@ class PreviewList extends ScrollView editSession = @rootView.open(operation.getPath()) bufferRange = operation.execute(editSession) editSession.setSelectedBufferRange(bufferRange, autoscroll: true) if bufferRange - @rootView.focus() + @.focus() false getPathCount: ->