commit 9053fdb1f84877cbbb535bee6b6f74ad0a0cbee6
author Steven Burrows <sburrows@villa-technologies.com> Wed Apr 12 12:08:16 2017 -0700
committer Simon Hunt <simon@onlab.us> Wed Apr 12 20:45:05 2017 +0000
tree 704b7911edee53a133d7be574dfe70a424dbc26c
parent 6bc67865ff58ad40ed5bd6b3bfc136ec357b62c7

Topo2 - Fixed the issue where the Toolbar was creating dublicate ID's
JIRA Tasks; ONOS-6279

Change-Id: If2daa9f35853f91cbbd23e301a6d975a06b72b8f

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

diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
index 06a5885..c4b7912 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
@@ -35,6 +35,7 @@
         this.appendElement('#topo2-background', 'g');
         zoomLayer = d3.select('#topo2-zoomlayer');
         zoomer = t2zs.getZoomer();
+        currentMap = null;
     }
 
     function setUpMap(mapId, mapFilePath, mapScale) {

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

diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js b/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
index 264ce54..620d2c6 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
@@ -30,7 +30,6 @@
 
                 var Toolbar = function () {
                     instance = this;
-                    this.el = tbs.createToolbar(this.className);
                 };
 
                 Toolbar.prototype = {
@@ -38,6 +37,7 @@
                     className: 'topo2-toolbar',
 
                     init: function () {
+                        this.el = tbs.createToolbar(this.className);
                         this.initKeyData();
                         this.addFirstRow();
                         this.el.addRow();