GUI -- Better cleanup of topo view when it is destroyed.

Change-Id: I038fb43f9a5afc63393583334576d0be81b64f1f

@@ -24,7 +24,7 @@
 
 
     // injected refs
     // injected refs
     var $log, fs, sus, is, ts, flash, tis, tms, td3, tss, tts, tos, fltr, tls,
     var $log, fs, sus, is, ts, flash, tis, tms, td3, tss, tts, tos, fltr, tls,
-        icfg, uplink;
+        icfg, uplink, svg;
 
 
     // configuration
     // configuration
     var linkConfig = {
     var linkConfig = {
@@ -52,8 +52,8 @@
             lookup: {},
             lookup: {},
             revLinkToKey: {}
             revLinkToKey: {}
         },
         },
-        lu = network.lookup,    // shorthand
-        rlk = network.revLinkToKey,
+        lu,                     // shorthand for lookup
+        rlk,                    // shorthand for revLinktoKey
         showHosts = false,      // whether hosts are displayed
         showHosts = false,      // whether hosts are displayed
         showOffline = true,     // whether offline devices are displayed
         showOffline = true,     // whether offline devices are displayed
         nodeLock = false,       // whether nodes can be dragged or not (locked)
         nodeLock = false,       // whether nodes can be dragged or not (locked)
@@ -595,9 +595,10 @@
     };
     };
 
 
     function tick() {
     function tick() {
-        node.attr(tickStuff.nodeAttr);
-        link.attr(tickStuff.linkAttr);
-        linkLabel.attr(tickStuff.linkLabelAttr);
+        // guard against null (which can happen when our view pages out)...
+        if (node) node.attr(tickStuff.nodeAttr);
+        if (link) link.attr(tickStuff.linkAttr);
+        if (linkLabel) linkLabel.attr(tickStuff.linkLabelAttr);
     }
     }
 
 
 
 
@@ -780,9 +781,13 @@
             // uplink is the api from the main topo source file
             // uplink is the api from the main topo source file
             // dim is the initial dimensions of the SVG as [w,h]
             // dim is the initial dimensions of the SVG as [w,h]
             // opts are, well, optional :)
             // opts are, well, optional :)
-            function initForce(svg, forceG, _uplink_, _dim_, opts) {
+            function initForce(_svg_, forceG, _uplink_, _dim_, opts) {
                 uplink = _uplink_;
                 uplink = _uplink_;
                 dim = _dim_;
                 dim = _dim_;
+                svg = _svg_;
+
+                lu = network.lookup;
+                rlk = network.revLinkToKey;
 
 
                 $log.debug('initForce().. dim = ' + dim);
                 $log.debug('initForce().. dim = ' + dim);
 
 
@@ -824,10 +829,11 @@
                 dim = _dim_;
                 dim = _dim_;
                 force.size(dim);
                 force.size(dim);
                 tms.newDim(dim);
                 tms.newDim(dim);
-                // Review -- do we need to nudge the layout ?
             }
             }
 
 
             function destroyForce() {
             function destroyForce() {
+                force.stop();
+
                 tls.destroyLink();
                 tls.destroyLink();
                 fltr.destroyFilter();
                 fltr.destroyFilter();
                 tos.destroyOblique();
                 tos.destroyOblique();
@@ -837,6 +843,20 @@
                 tms.destroyModel();
                 tms.destroyModel();
                 ts.removeListener(themeListener);
                 ts.removeListener(themeListener);
                 themeListener = null;
                 themeListener = null;
+
+                // clean up the DOM
+                svg.selectAll('g').remove();
+                svg.selectAll('defs').remove();
+
+                // clean up internal state
+                network.nodes = [];
+                network.links = [];
+                network.lookup = {};
+                network.revLinkToKey = {};
+
+                linkG = linkLabelG = nodeG = portLabelG = null;
+                link = linkLabel = node = null;
+                force = drag = null;
             }
             }
 
 
             return {
             return {

@@ -303,6 +303,10 @@
 
 
         ps.destroyPanel(idIns);
         ps.destroyPanel(idIns);
         oiBox = null;
         oiBox = null;
+
+        onosInstances = {};
+        onosOrder = [];
+        oiShowMaster = false;
     }
     }
 
 
     // ==========================
     // ==========================