Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix disappearing nodes
[controller.git]
/
opendaylight
/
web
/
root
/
src
/
main
/
resources
/
js
/
one-topology.js
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 df36ea4b572229117927f61bb569fa800ad470ca..27aabca6fd7c9ffc35c2127ab0a6bd0ea4be156b 100644
(file)
--- 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) {
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';
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';
one.topology.graph.canvas.getElement().style.cursor = 'pointer';
+ }
},
onMouseLeave: function(node, eventInfo, e) {
one.topology.graph.canvas.getElement().style.cursor = '';
},
onMouseLeave: function(node, eventInfo, e) {
one.topology.graph.canvas.getElement().style.cursor = '';
@@
-134,10
+138,14
@@
one.topology.init = function(json) {
var data = {};
data['x'] = ps.x;
data['y'] = ps.y;
var data = {};
data['x'] = ps.x;
data['y'] = ps.y;
- $.post('/
one
/topology/node/' + did, data);
+ $.post('/
controller/web
/topology/node/' + did, data);
},
onClick: function(node, eventInfo, e) {
},
onClick: function(node, eventInfo, e) {
- return false;
+ if(one.f.topology === undefined) {
+ return false;
+ } else {
+ one.f.topology.Events.onClick(node, eventInfo);
+ }
}
},
iterations: 200,
}
},
iterations: 200,
@@
-177,6
+185,7
@@
one.topology.init = function(json) {
style.textAlign = "center";
}
});
style.textAlign = "center";
}
});
+
one.topology.graph.loadJSON(json);
// compute positions incrementally and animate.
one.topology.graph.computeIncremental({
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");
}
}
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,
one.topology.graph.animate({
modes: ['linear'],
transition: $jit.Trans.Elastic.easeOut,
@@
-207,12
+216,12
@@
one.topology.init = function(json) {
one.topology.update = function() {
$('#topology').empty();
one.topology.update = function() {
$('#topology').empty();
- $.getJSON(one.global.remoteAddress+"
one
/topology/visual.json", function(data) {
+ $.getJSON(one.global.remoteAddress+"
controller/web
/topology/visual.json", function(data) {
one.topology.init(data);
});
}
/** INIT */
one.topology.init(data);
});
}
/** INIT */
-$.getJSON(one.global.remoteAddress+"
one
/topology/visual.json", function(data) {
+$.getJSON(one.global.remoteAddress+"
controller/web
/topology/visual.json", function(data) {
one.topology.init(data);
one.topology.init(data);
-});
\ No newline at end of file
+});