From 5abbab3fa32e424649b331b870138c3cbf64e4f5 Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Fri, 13 May 2016 11:40:02 +0200
Subject: [PATCH] Close terminal on ESC has higher prio than search blur

---
 client/app/scripts/actions/app-actions.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
index d5eaa6191..792d9b821 100644
--- a/client/app/scripts/actions/app-actions.js
+++ b/client/app/scripts/actions/app-actions.js
@@ -357,19 +357,21 @@ export function hitEsc() {
   return (dispatch, getState) => {
     const state = getState();
     const controlPipe = state.get('controlPipes').last();
-    if (state.get('showingHelp')) {
-      dispatch(hideHelp());
-    } else if (state.get('searchQuery')) {
-      dispatch(doSearch(''));
-    } else if (state.get('searchFocused')) {
-      dispatch(blurSearch());
-    } else if (controlPipe && controlPipe.get('status') === 'PIPE_DELETED') {
+    if (controlPipe && controlPipe.get('status') === 'PIPE_DELETED') {
       dispatch({
         type: ActionTypes.CLICK_CLOSE_TERMINAL,
         pipeId: controlPipe.get('id')
       });
       updateRoute(getState);
       // Don't deselect node on ESC if there is a controlPipe (keep terminal open)
+    } else if (state.get('searchFocused')) {
+      if (state.get('searchQuery')) {
+        dispatch(doSearch(''));
+      } else {
+        dispatch(blurSearch());
+      }
+    } else if (state.get('showingHelp')) {
+      dispatch(hideHelp());
     } else if (state.get('nodeDetails').last() && !controlPipe) {
       dispatch({ type: ActionTypes.DESELECT_NODE });
       updateRoute(getState);