init_force_layout() - adapt Link with __src,__dst property aliaseswip/addNode-refactoring

2 files changed, 18 insertions, 8 deletions

diff --git a/src/model/core.js b/src/model/core.js
index a6c66960..7c123fd2 100644
--- a/src/model/core.js
+++ b/src/model/core.js
@@ -161,6 +161,8 @@ define([], function() {
 
     return {
         init : init,
+        Node: Node, // allow model adaptation
+        Link: Link, // allow model adaptation
         random_node_name : random_node_name,
         crete_node_from_spec : crete_node_from_spec,
         crete_link_from_spec : crete_link_from_spec,
diff --git a/src/rz_core.js b/src/rz_core.js
index c29b458f..a0b51d9d 100644
--- a/src/rz_core.js
+++ b/src/rz_core.js
@@ -102,21 +102,29 @@ var initDrawingArea = function () {
     .on("drag", dragged)
     .on("dragend", dragended);
 
+function init_force_layout(){
+    var el = document.body;
     var w = $(el).innerWidth(),
         h = $(el).innerHeight();
 
     force = d3.layout.force()
-        .distance(120)
-        .gravity(0.12)
-        .charge(-1800)
-        .size([w, h])
-        .on("tick", tick)
-        .start();
+    .distance(120)
+    .gravity(0.12)
+    .charge(-1800)
+    .size([w, h])
+    .on("tick", tick)
+    .start();
 
-    graph.update = update;
-    $('#canvas_d3').dblclick(canvas_handler_dblclick);
+    // adapte Link to force_layoutL create __src,__dst aliases
+    model_core.Link.prototype.source = function(){
+        return this.__src;
+    }
+    model_core.Link.prototype.target = function(){
+        return this.__dst;
+    }
 }
 
+init_force_layout();
 initDrawingArea();
 
 /**