From 3e75ab6c5aa64e9cf4d438dc714e64438675775c Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 23 Nov 2014 10:56:44 +0200
Subject: init_force_layout() - adapt Link with __src,__dst property aliases

---
 src/model/core.js |  2 ++
 src/rz_core.js    | 38 +++++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/model/core.js b/src/model/core.js
index 54aeb359..5dfd14fc 100644
--- a/src/model/core.js
+++ b/src/model/core.js
@@ -164,6 +164,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 3d225a3a..ef06040b 100644
--- a/src/rz_core.js
+++ b/src/rz_core.js
@@ -96,27 +96,39 @@ var initDrawingArea = function () {
     vis.append("g").attr("id", "link-group");
 
     drag = d3.behavior.drag()
-    .origin(function(d) { return d; })
-    .on("dragstart", dragstarted)
-    .on("drag", dragged)
-    .on("dragend", dragended);
+             .origin(function(d) { return d; })
+             .on("dragstart", dragstarted)
+             .on("drag", dragged)
+             .on("dragend", dragended);
 
+    graph.update = update;
+    // $('#canvas_d3').dblclick(canvas_handler_dblclick); - see #138
+}
+
+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();
-
-    graph.update = update;
-    $('#canvas_d3').dblclick(canvas_handler_dblclick);
+              .distance(120)
+              .gravity(0.12)
+              .charge(-1800)
+              .size([w, h])
+              .on("tick", tick)
+              .start();
+
+    // 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;
+    }
 }
 
 initDrawingArea();
+init_force_layout();
 
 /**
  * find the visual element counterpart of a given model object. This relies on
-- 
cgit v1.3.1