diff --git a/src/main/scripts/neo4jd3.js b/src/main/scripts/neo4jd3.js index 0e53f349..249568b7 100644 --- a/src/main/scripts/neo4jd3.js +++ b/src/main/scripts/neo4jd3.js @@ -185,13 +185,13 @@ function Neo4jD3(_selector, _options) { var n = appendNode(); appendRingToNode(n); - appendOutlineToNode(n); - - if (options.icons) { - appendTextToNode(n); - } - - if (options.images) { + appendOutlineToNode(n); + + if (options.icons) { + appendTextToNode(n); + } + + if (options.images) { appendImageToNode(n); } @@ -520,8 +520,8 @@ function Neo4jD3(_selector, _options) { for (key in options.images) { if (options.images.hasOwnProperty(key)) { keys = key.split('|'); - - if (!options.imageMap[keys[0]]) { + + if (!options.imageMap[keys[0]]) { options.imageMap[keys[0]] = [key]; } else { options.imageMap[keys[0]].push(key); @@ -567,10 +567,7 @@ function Neo4jD3(_selector, _options) { nodes = []; relationships = []; - d3.json(neo4jDataUrl, function(error, data) { - if (error) { - throw error; - } + updateWithNeo4jData(data); }); @@ -874,7 +871,7 @@ function Neo4jD3(_selector, _options) { } function updateWithNeo4jData(neo4jData) { - var d3Data = neo4jDataToD3Data(neo4jData); + var d3Data = neo4jDataToD3Data(neo4jData); updateWithD3Data(d3Data); }