You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/04/20 20:25:19 UTC

qpid-dispatch git commit: DISPATCH-283: Fix typo that was preventing router nodes from being expanded in the tree

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master c2ee7cb56 -> 20a43f75c


DISPATCH-283: Fix typo that was preventing router nodes from being expanded in the tree


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/20a43f75
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/20a43f75
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/20a43f75

Branch: refs/heads/master
Commit: 20a43f75c0a7226a4439aca3af9a0955ee353728
Parents: c2ee7cb
Author: Ernest Allen <ea...@redhat.com>
Authored: Wed Apr 20 14:24:57 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Wed Apr 20 14:24:57 2016 -0400

----------------------------------------------------------------------
 console/hawtio/src/main/webapp/plugin/js/qdrOverview.js | 2 +-
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/20a43f75/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
index f25df04..2f01645 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
@@ -556,7 +556,7 @@ var QDR = (function (QDR) {
 		routers.type = "Routers"
 		routers.info = allRouterInfo
 		routers.focus = true
-		routers.expanded = true
+		routers.expand = true
 		routers.key = "Routers"
 	    routers.addClass = "routers"
 		topLevelChildren.push(routers)

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/20a43f75/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 787c51d..7acbe0f 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -1126,7 +1126,7 @@ var QDR = (function (QDR) {
                     d.normals.forEach( function (n) {
                         $scope.multiData.push(n)
                     })
-					if (!$scope.$$phase) $scope.$apply()
+                    $scope.$apply();
                     d3.select('#multiple_details')
                         .style({
                             display: 'block',
@@ -1304,7 +1304,7 @@ var QDR = (function (QDR) {
 			// Don't update the underlying topology diagram if we are adding a new node.
 			// Once adding is completed, the topology will update automatically if it has changed
 			if ($scope.addingNode.step > 0)
-				return false; 
+				return false;
 			var nodeInfo = QDRService.topology.nodeInfo();
 			if (Object.keys(nodeInfo).length != Object.keys(savedKeys).length)
 				return true;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org