Revert "parameter injection mechanism to onos gui from other gui apps" - testing GUI verification failures
This reverts commit 2a4e1ac1d92955f01fd2532f8847a55c3b367f9e.
Change-Id: I00c34d3bdf3010dba43648e9db4a054f40616e2a
diff --git a/web/gui/src/main/webapp/app/fw/nav/nav.js b/web/gui/src/main/webapp/app/fw/nav/nav.js
index d962b8e..671fa91 100644
--- a/web/gui/src/main/webapp/app/fw/nav/nav.js
+++ b/web/gui/src/main/webapp/app/fw/nav/nav.js
@@ -25,7 +25,6 @@
// internal state
var navShown = false;
- var ovParamsDataNs = {};
function updatePane() {
var vis = navShown ? 'visible' : 'hidden';
@@ -52,19 +51,8 @@
return false;
}
- function isEmpty(obj) {
- for (var x in obj) { return false; }
- return true;
- }
-
function navTo(path, params) {
-
var url;
- if (params.hasOwnProperty('ovParams') && !isEmpty(params.ovParams) ) {
- ovParamsDataNs = params.ovParams;
- delete params.ovParams;
- }
-
if (!path) {
$log.warn('Not a valid navigation path');
return null;
@@ -80,11 +68,6 @@
url = $location.absUrl();
$log.log('Navigating to ', url);
$window.location.href = url;
-
- }
-
- function getOvParamsData() {
- return ovParamsDataNs;
}
angular.module('onosNav', [])
@@ -101,20 +84,18 @@
.factory('NavService',
['$log', '$location', '$window', 'FnService',
- function (_$log_, _$location_, _$window_, _fs_ ) {
+ function (_$log_, _$location_, _$window_, _fs_) {
$log = _$log_;
$location = _$location_;
$window = _$window_;
fs = _fs_;
-
return {
showNav: showNav,
hideNav: hideNav,
toggleNav: toggleNav,
hideIfShown: hideIfShown,
navTo: navTo,
- navPassedData: getOvParamsData,
};
}]);
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 fef2da5..04b552c 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -31,7 +31,7 @@
// references to injected services
var $scope, $log, $loc, $timeout,
fs, ks, zs, gs, ms, sus, flash, wss, ps, th, tds, t3s, tes, tfs, tps,
- tis, tms, tss, tls, tos, fltr, ttbs, tspr, tov, ns;
+ tis, tms, tss, tls, tos, fltr, ttbs, tspr, tov;
// DOM elements
var ovtopo, svg, defs, zoomLayer, mapG, spriteG, forceG, noDevsLayer;
@@ -596,7 +596,7 @@
'TopoSelectService', 'TopoLinkService', 'TopoTrafficService',
'TopoObliqueService', 'TopoFilterService', 'TopoToolbarService',
'TopoMapService', 'TopoSpriteService', 'TooltipService',
- 'TopoOverlayService', 'LionService','NavService',
+ 'TopoOverlayService', 'LionService',
function (_$scope_, _$log_, _$loc_, _$timeout_, _$cookies_,
_fs_, mast, _ks_, _zs_,
@@ -607,7 +607,7 @@
_tss_, _tls_, _tts_,
_tos_, _fltr_, _ttbs_,
_tms_, _tspr_, _ttip_,
- _tov_, lion, _ns_) {
+ _tov_, lion) {
var params = _$loc_.search(),
selOverlay = params.overlayId,
@@ -654,7 +654,6 @@
tspr = _tspr_;
tov = _tov_;
tss = _tss_;
- ns = _ns_;
tms.start({
toggleMap: toggleMap,
@@ -662,9 +661,7 @@
setMap: setMap,
});
- $scope.ovParamsData = ns.navPassedData();
-
- // pull intent data from the query string...
+ // pull intent data from the query string...
if (params.key && params.appId && params.appName) {
$scope.intentData = {
key: params.key,
@@ -674,7 +671,6 @@
};
}
-
$scope.notifyResize = function () {
svgResized(fs.windowSize(mast.mastHeight()));
};
@@ -753,7 +749,7 @@
restoreConfigFromPrefs();
- ttbs.selectOverlay(selOverlay || prefsState.ovid, $scope.ovParamsData);
+ ttbs.selectOverlay(selOverlay || prefsState.ovid);
$log.debug('registered overlays...', tov.list());
$log.log('OvTopoCtrl has been created');
diff --git a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
index 18559d3..8b37002 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
@@ -98,8 +98,6 @@
spr: 'S',
// NOTE: toolbar state is handled separately
};
- // Params passed to overlay.
- var ovParams = {};
function init(_api_) {
api = _api_;
@@ -306,17 +304,12 @@
persistTopoPrefs('toolbar');
}
- function getOverlayParams(typeOfOverlay) {
- return ovParams;
- }
-
- function selectOverlay(ovid, params) {
+ function selectOverlay(ovid) {
var idx = ovIndex[defaultOverlay] || 0,
pidx = (ovid === null) ? 0 : ovIndex[ovid] || -1;
if (pidx >= 0 && pidx < ovRset.size()) {
idx = pidx;
}
- ovParams = params;
ovRset.selectedIndex(idx);
}
@@ -348,7 +341,6 @@
toggleToolbar: toggleToolbar,
selectOverlay: selectOverlay,
defaultPrefs: defaultPrefsState,
- paramsOverlay: getOverlayParams,
fnkey: fnkey,
setLionBundle: function (bundle) { topoLion = bundle; },
};