Topo2: Fixing the incorrectly merged patch (13089)
Change-Id: I35d1cdb343fc15b6b67fa10f5fc8f5fb3677c547
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
index 56ba42f..d034b7a 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
@@ -71,7 +71,6 @@
function allInstances(data) {
$log.debug('>> topo2AllInstances event:', data);
- doTmpCurrentLayout(data);
t2is.allInstances(data);
}
@@ -84,14 +83,12 @@
function currentRegion(data) {
$log.debug('>> topo2CurrentRegion event:', data);
- doTmpCurrentRegion(data);
t2rs.addRegion(data);
t2ls.createForceLayout();
}
function topo2PeerRegions(data) {
$log.debug('>> topo2PeerRegions event:', data);
- doTmpPeerRegions(data);
}
function modelEvent(data) {
@@ -184,14 +181,15 @@
angular.module('ovTopo2')
.factory('Topo2ForceService', [
- '$log', 'WebSocketService', 'Topo2InstanceService',
+ '$log', '$location', 'WebSocketService', 'Topo2InstanceService',
'Topo2RegionService', 'Topo2LayoutService', 'Topo2ViewService',
'Topo2BreadcrumbService', 'Topo2ZoomService', 'Topo2SelectService',
'Topo2BackgroundService',
- function (_$log_, _wss_, _t2is_, _t2rs_, _t2ls_,
+ function (_$log_, _$loc_, _wss_, _t2is_, _t2rs_, _t2ls_,
_t2vs_, _t2bcs_, zoomService, _t2ss_, _t2bgs_) {
$log = _$log_;
+ $loc = _$loc_;
wss = _wss_;
t2is = _t2is_;
t2rs = _t2rs_;
diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index 2e893d3..f7c8046 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -151,11 +151,13 @@
$routeProvider.when('/' + vid, {
controller: viewCtrlName(vid),
controllerAs: 'ctrl',
- templateUrl: viewTemplateUrl(vid)
+ templateUrl: viewTemplateUrl(vid),
// Disable reload on $loc.hash() changes for bookmarked topo regions
- // reloadOnSearch: (vid !== 'topo2')
+ reloadOnSearch: (vid !== 'topo2')
// <SDH> assume this is not needed for ?regionId=... query string
+ // <SBM> Yes this is still needed. Without it the page will reload when navigating between
+ // regions which loads the new regions without a clean transition to it.
});
}
});