X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fweb%2Froot%2Fsrc%2Fmain%2Fresources%2Fjs%2Fone-topology.js;h=27aabca6fd7c9ffc35c2127ab0a6bd0ea4be156b;hb=304c00a75e11781c10ec62f9bf10c29fa13a559b;hp=fc06a8c9882ec2e20aec2c75563a10ceda3422e4;hpb=bb3842c34d5c56d9aa37c02e9eea6128a2f6d86b;p=controller.git diff --git a/opendaylight/web/root/src/main/resources/js/one-topology.js b/opendaylight/web/root/src/main/resources/js/one-topology.js index fc06a8c988..27aabca6fd 100644 --- a/opendaylight/web/root/src/main/resources/js/one-topology.js +++ b/opendaylight/web/root/src/main/resources/js/one-topology.js @@ -108,10 +108,14 @@ one.topology.init = function(json) { enable: true, type: 'Native', onMouseEnter: function(node, eventInfo, e) { - if (node.id != undefined) // if node + // if node + if (node.id != undefined) { one.topology.graph.canvas.getElement().style.cursor = 'move'; - else if (eventInfo.edge != undefined && eventInfo.edge.nodeTo.data["$type"] == "swtch" && eventInfo.edge.nodeFrom.data["$type"] == "swtch") + } else if (eventInfo.edge != undefined && + eventInfo.edge.nodeTo.data["$type"] == "swtch" && + eventInfo.edge.nodeFrom.data["$type"] == "swtch") { one.topology.graph.canvas.getElement().style.cursor = 'pointer'; + } }, onMouseLeave: function(node, eventInfo, e) { one.topology.graph.canvas.getElement().style.cursor = ''; @@ -137,7 +141,11 @@ one.topology.init = function(json) { $.post('/controller/web/topology/node/' + did, data); }, onClick: function(node, eventInfo, e) { - return false; + if(one.f.topology === undefined) { + return false; + } else { + one.f.topology.Events.onClick(node, eventInfo); + } } }, iterations: 200, @@ -177,6 +185,7 @@ one.topology.init = function(json) { style.textAlign = "center"; } }); + one.topology.graph.loadJSON(json); // compute positions incrementally and animate. one.topology.graph.computeIncremental({ @@ -194,7 +203,7 @@ one.topology.init = function(json) { node.setPos(new $jit.Complex(x, y), "end"); } } - console.log('done'); + console.log('done'); one.topology.graph.animate({ modes: ['linear'], transition: $jit.Trans.Elastic.easeOut, @@ -215,4 +224,4 @@ one.topology.update = function() { /** INIT */ $.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) { one.topology.init(data); -}); \ No newline at end of file +});