commit 448468c39fd18736f87b1810a8821d4fa8df5625
author Steven Burrows <sburrows@villa-technologies.com> Thu Apr 13 16:09:30 2017 -0700
committer Simon Hunt <simon@onlab.us> Fri Apr 14 16:25:04 2017 +0000
tree 65a8d05131a67ec29bb67bb5d657061e6f1e9aa9
parent 07b90201990d2d38d740bcc6f7d6c71f1f7c1a85

Topo2 - Removed old code carried over from clasic topo
	- Removed Map Dialog and Filters

Change-Id: Id8d2791b7e13b0eedf7de1ed484edc7678e2bb77

web/gui/src/main/webapp/app/view/topo2/topo2Layout.js

diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
index d1747a3..2a8e95d 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
@@ -79,14 +79,13 @@
     .factory('Topo2LayoutService',
         [
             '$log', '$timeout', 'WebSocketService', 'SvgUtilService', 'Topo2RegionService',
-            'Topo2D3Service', 'Topo2ViewService', 'Topo2SelectService', 'Topo2ZoomService',
+            'Topo2ViewService', 'Topo2SelectService', 'Topo2ZoomService',
             'Topo2ViewController',
-            function ($log, $timeout, wss, sus, t2rs, t2d3, t2vs, t2ss, t2zs,
+            function ($log, $timeout, wss, sus, t2rs, t2vs, t2ss, t2zs,
                       ViewController) {
 
                 var Layout = ViewController.extend({
                     init: function (svg, forceG, uplink, dim, zoomer, opts) {
-                        $log.debug('initialize Layout');
                         instance = this;
 
                         this.svg = svg;
@@ -94,7 +93,6 @@
                         // Append all the SVG Group elements to the forceG object
                         this.createForceElements();
 
-                        this.uplink = uplink;
                         this.dim = dim;
                         this.zoomer = zoomer;
 
@@ -219,10 +217,7 @@
                             .transition()
                             .attr('opacity', 1);
 
-                        entering.filter('.device').each(t2d3.nodeEnter);
-                        entering.filter('.sub-region').each(t2d3.nodeEnter);
-                        entering.filter('.host').each(t2d3.nodeEnter);
-                        entering.filter('.peer-region').each(t2d3.nodeEnter);
+                        entering.each(function (d) { d.onEnter(this, d) });
 
                         this.force.nodes(regionNodes);
                     },
@@ -246,7 +241,7 @@
                                 'stroke-width': linkConfig.inWidth
                             });
 
-                        entering.each(t2d3.nodeEnter);
+                        entering.each(function (d) { d.onEnter(this, d) });
 
                         // operate on exiting links:
                         this.link.exit()