commit 8a119b03191ad966303e58c1d637f718f0336a71
author Simon Hunt <simon@onlab.us> Tue Mar 29 16:00:32 2016 -0700
committer Simon Hunt <simon@onlab.us> Tue Mar 29 16:00:40 2016 -0700
tree 45b197fb29ef17b60eabd1c2028569da40182837
parent eea6861530d89747a02af7dbd2ce6d712c1d6bde

ONOS-4217: WebUI -- fix broken preferences / querystring precedence.

Change-Id: I9205e344c3b7dfa751ccb033d595715579913c3b

web/gui/src/main/webapp/app/fw/util/prefs.js

diff --git a/web/gui/src/main/webapp/app/fw/util/prefs.js b/web/gui/src/main/webapp/app/fw/util/prefs.js
index eb3b8bb..4dc95ea 100644
--- a/web/gui/src/main/webapp/app/fw/util/prefs.js
+++ b/web/gui/src/main/webapp/app/fw/util/prefs.js
@@ -26,9 +26,19 @@
     // internal state
     var cache = {}, listeners = [];
 
-    // returns the preference by the specified name
-    function getPrefs(name, defaults) {
-        return cache[name] || defaults;
+    // returns the preference settings for the specified key
+    function getPrefs(name, defaults, qparams) {
+        var obj = angular.extend({}, defaults || {}, cache[name] || {});
+
+        // if query params are specified, they override...
+        if (fs.isO(qparams)) {
+            angular.forEach(obj, function (v, k) {
+                if (qparams.hasOwnProperty(k)) {
+                    obj[k] = qparams[k];
+                }
+            });
+        }
+        return obj;
     }
 
     // converts string values to numbers for selected (or all) keys
@@ -57,7 +67,7 @@
     function updatePrefs(data) {
         $log.info('User properties updated');
         cache = data;
-        listeners.forEach(function (l) { l(); });
+        listeners.forEach(function (lsnr) { lsnr(); });
     }
 
     function addListener(listener) {

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 069fa42..b6c83ce 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -30,7 +30,8 @@
 
     // references to injected services
     var $scope, $log, $cookies, fs, ks, zs, gs, ms, sus, flash, wss, ps, th,
-        tds, t3s, tes, tfs, tps, tis, tss, tls, tts, tos, fltr, ttbs, tspr, ttip, tov;
+        tds, t3s, tes, tfs, tps, tis, tss, tls, tts, tos, fltr, ttbs, tspr,
+        ttip, tov;
 
     // DOM elements
     var ovtopo, svg, defs, zoomLayer, mapG, spriteG, forceG, noDevsLayer;
@@ -368,15 +369,14 @@
     }
 
     function setUpMap($loc) {
-        var qp = $loc.search(),
-            pr = ps.getPrefs('topo_mapid', {
-                id: qp.mapid || 'usa',
-                scale: qp.mapscale || 1,
-                tint: qp.tint || 'off'
-            }),
-            mapId = pr.id,
-            mapScale = pr.scale,
-            tint = pr.tint,
+        var prefs = ps.getPrefs(
+                'topo_mapid',
+                { mapid: 'usa', mapscale: 1, tint: 'off'},
+                $loc.search()
+            ),
+            mapId = prefs.mapid,
+            mapScale = prefs.mapscale,
+            tint = prefs.tint,
             promise,
             cfilter;
 
@@ -415,7 +415,7 @@
                 shading: shading()
             });
         }
-        ps.setPrefs('topo_mapid', { id: mapId, scale: mapScale, tint: tint });
+        ps.setPrefs('topo_mapid', prefs);
         return promise;
     }
 
@@ -438,13 +438,12 @@
     }
 
     function setUpSprites($loc, tspr) {
-        var s1 = $loc.search().sprites,
-            s2 = ps.getPrefs('topo_sprites', { id: s1 }),
-            sprId = s2.id;
+        var prefs = ps.getPrefs('topo_sprites', { sprites: '' }, $loc.search()),
+            sprId = prefs.sprites;
 
         spriteG = zoomLayer.append ('g').attr('id', 'topo-sprites');
         if (sprId) {
-            ps.setPrefs('topo_sprites', {id:sprId});
+            ps.setPrefs('topo_sprites', prefs);
             tspr.loadSprites(spriteG, defs, sprId);
         }
     }