commit fc5c58437f9f5d19000ea3db0b12efb7a1e03b16
author Simon Hunt <simon@onlab.us> Wed Feb 01 23:32:18 2017 -0800
committer Simon Hunt <simon@onlab.us> Thu Feb 02 10:23:41 2017 -0800
tree 1ca7aee0dc20354a5281c8dfd0b7d223ac60230d
parent 3ccd3730665d4506b140b84314005d97f61d79ba

ONOS-5726: completed implementation of "showIntent" overlay support.
(note, there is still some cleanup to be done).

Change-Id: I6c805ad954b97ca261b5536240b277df7712a834

web/gui/src/main/webapp/app/view/topo/topo.js

diff --git a/web/gui/src/main/webapp/app/view/topo/topo.js b/web/gui/src/main/webapp/app/view/topo/topo.js
index 90e9411..1762cf4 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -476,7 +476,9 @@
 
     function restoreConfigFromPrefs() {
         // NOTE: toolbar will have set this for us..
-        prefsState = ps.asNumbers(ps.getPrefs('topo_prefs', ttbs.defaultPrefs));
+        prefsState = ps.asNumbers(
+            ps.getPrefs('topo_prefs', ttbs.defaultPrefs), ['ovid'], true
+        );
 
         $log.debug('TOPO- Prefs State:', prefsState);
 
@@ -498,7 +500,9 @@
     //  have opened the websocket to the server; hence this extra function
     // invoked after tes.start()
     function restoreSummaryFromPrefs() {
-        prefsState = ps.asNumbers(ps.getPrefs('topo_prefs', ttbs.defaultPrefs));
+        prefsState = ps.asNumbers(
+            ps.getPrefs('topo_prefs', ttbs.defaultPrefs), ['ovid'], true
+        );
         $log.debug('TOPO- Prefs SUMMARY State:', prefsState.summary);
 
         flash.enable(false);
@@ -518,9 +522,6 @@
 
             // if an intent should be shown, invoke the appropriate callback
             if ($scope.intentData) {
-
-                // TODO: if a specific overlay was requested, activate that first
-
                 tov.hooks.showIntent($scope.intentData);
             }
 
@@ -546,7 +547,9 @@
                   _tds_, _t3s_, _tes_,
                   _tfs_, _tps_, _tis_, _tss_, _tls_, _tts_, _tos_, _fltr_,
                   _ttbs_, _tms_, _tspr_, _ttip_, _tov_) {
+
             var params = _$loc_.search(),
+                selOverlay = params.overlayId,
                 projection,
                 dim,
                 uplink = {
@@ -668,7 +671,8 @@
             tps.initPanels();
 
             restoreConfigFromPrefs();
-            ttbs.setDefaultOverlay(prefsState.ovidx);
+
+            ttbs.selectOverlay(selOverlay || prefsState.ovid);
 
             $log.debug('registered overlays...', tov.list());
             $log.log('OvTopoCtrl has been created');