From 263eef52ce1383f275b3dd2f8731b12b7a87d9c5 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 11 Jan 2015 13:30:05 -0500 Subject: [PATCH] maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events --- app/assets/javascripts/src/Metamaps.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 67629530..981cafce 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -2812,10 +2812,6 @@ Metamaps.Control = { hideNode: function (nodeid) { var node = Metamaps.Visualize.mGraph.graph.getNode(nodeid); var graph = Metamaps.Visualize.mGraph; - if (nodeid == Metamaps.Visualize.mGraph.root) { // && Metamaps.Visualize.type === "RGraph" - var newroot = _.find(graph.graph.nodes, function(n){ return n.id !== nodeid; }); - graph.root = newroot ? newroot.id : null; - } Metamaps.Control.deselectNode(node); @@ -2830,6 +2826,10 @@ Metamaps.Control = { duration: 500 }); setTimeout(function () { + if (nodeid == Metamaps.Visualize.mGraph.root) { // && Metamaps.Visualize.type === "RGraph" + var newroot = _.find(graph.graph.nodes, function(n){ return n.id !== nodeid; }); + graph.root = newroot ? newroot.id : null; + } Metamaps.Visualize.mGraph.graph.removeNode(nodeid); }, 500); Metamaps.Filter.checkMetacodes();