From 308c1596a04157fed433e56d03eda9ccc3fc13f5 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Fri, 13 Nov 2015 16:05:26 +0100 Subject: [PATCH] Unset previous details when deselecting a node --- client/app/scripts/stores/app-store.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/client/app/scripts/stores/app-store.js b/client/app/scripts/stores/app-store.js index 74b713c89..e1db6154b 100644 --- a/client/app/scripts/stores/app-store.js +++ b/client/app/scripts/stores/app-store.js @@ -97,6 +97,11 @@ function setDefaultTopologyOptions(topologyList) { }); } +function deSelectNode() { + selectedNodeId = null; + nodeDetails = null; +} + // Store API const AppStore = Object.assign({}, EventEmitter.prototype, { @@ -259,14 +264,14 @@ AppStore.registeredCallback = function(payload) { break; case ActionTypes.CLICK_CLOSE_DETAILS: - selectedNodeId = null; + deSelectNode(); AppStore.emit(AppStore.CHANGE_EVENT); break; case ActionTypes.CLICK_NODE: if (payload.nodeId === selectedNodeId) { // clicking same node twice unsets the selection - selectedNodeId = null; + deSelectNode(); } else { selectedNodeId = payload.nodeId; } @@ -274,7 +279,7 @@ AppStore.registeredCallback = function(payload) { break; case ActionTypes.CLICK_TOPOLOGY: - selectedNodeId = null; + deSelectNode(); if (payload.topologyId !== currentTopologyId) { setTopology(payload.topologyId); nodes = nodes.clear(); @@ -304,8 +309,7 @@ AppStore.registeredCallback = function(payload) { break; case ActionTypes.HIT_ESC_KEY: - nodeDetails = null; - selectedNodeId = null; + deSelectNode(); AppStore.emit(AppStore.CHANGE_EVENT); break;