open.source/springy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert mixed argument patch for addNode(), because

Browse Source 
addNodes() in loadJSON already supports single string
argument.
This commit is contained in:
anatoly techtonik 2013-03-12 15:16:45 +03:00
parent 1b93bd7dc7
commit adebe2dab0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
springy.js
View File

@ -61,14 +61,7 @@ var Edge = function(id, source, target, data) {
// this.data.type
};
Graph.prototype.addNode = function(mixed) {
// mixed can be Node object or a string
var node;
if (typeof mixed == "string" || mixed instanceof String) {
node = new Node(mixed, {label:mixed});
} else {
node = mixed;
}
Graph.prototype.addNode = function(node) {
if (!(node.id in this.nodeSet)) {
this.nodes.push(node);
}
@ -83,7 +76,9 @@ Graph.prototype.addNodes = function() {
// accepts variable number of arguments, where each argument
// is a string that becomes both node identifier and label
for (var i = 0; i < arguments.length; i++) {
this.addNode(arguments[i]);
var name = arguments[i];
var node = new Node(name, {label:name});
this.addNode(node);
}
};
@ -177,7 +172,7 @@ of nodes and edges:
if ('nodes' in json && 'edges' in json) {
var graph = this;
json['nodes'].forEach(function(name) {
graph.addNode(name);
graph.addNodes(name);
});
json['edges'].forEach(function(pair) {
graph.addEdges(pair);