From 8a7cfdb46f307bd985d717414f0af1113f42b7d1 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Thu, 14 Jan 2016 18:08:08 +0100 Subject: [PATCH] Allow dismissing a disconnected terminal w/ --- client/app/scripts/actions/app-actions.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js index e52b8639e..0c5ad6d01 100644 --- a/client/app/scripts/actions/app-actions.js +++ b/client/app/scripts/actions/app-actions.js @@ -117,11 +117,17 @@ export function enterNode(nodeId) { } export function hitEsc() { + const controlPipe = AppStore.getControlPipe(); + if (controlPipe && controlPipe.status === 'PIPE_DELETED') { + AppDispatcher.dispatch({ + type: ActionTypes.CLICK_CLOSE_TERMINAL, + pipeId: controlPipe.id + }); // Dont deselect node on ESC if there is a controlPipe (keep terminal open) - if (AppStore.getSelectedNodeId() && !AppStore.getControlPipe()) { + } else if (AppStore.getSelectedNodeId() && !controlPipe) { AppDispatcher.dispatch({type: ActionTypes.DESELECT_NODE}); - updateRoute(); } + updateRoute(); } export function leaveEdge(edgeId) {