From dd54cd3689fd0d0cf3af0f855361be73904f53dc Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Fri, 19 Jan 2018 11:03:00 +0100
Subject: [PATCH] Restore functionality, Fixes: #50

---
 src/app/cartography/map/map.component.ts           |  2 +-
 src/app/cartography/shared/widgets/links.widget.ts |  6 ++++--
 src/app/cartography/shared/widgets/nodes.widget.ts | 12 ++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/cartography/map/map.component.ts b/src/app/cartography/map/map.component.ts
index b74fca86..8cec0eb8 100644
--- a/src/app/cartography/map/map.component.ts
+++ b/src/app/cartography/map/map.component.ts
@@ -95,7 +95,7 @@ export class MapComponent implements OnInit, OnChanges, OnDestroy {
 
       this.graphLayout = new GraphLayout();
 
-      this.graphLayout.getNodesWidget().addOnNodeDraggingCallback((n: Node) => {
+      this.graphLayout.getNodesWidget().addOnNodeDraggingCallback((event: any, n: Node) => {
         const linksWidget = this.graphLayout.getLinksWidget();
         linksWidget.select(this.svg).each(function(this: SVGGElement, link: Link)  {
           if (link.target.node_id === n.node_id || link.source.node_id === n.node_id) {
diff --git a/src/app/cartography/shared/widgets/links.widget.ts b/src/app/cartography/shared/widgets/links.widget.ts
index a79617f6..4d003169 100644
--- a/src/app/cartography/shared/widgets/links.widget.ts
+++ b/src/app/cartography/shared/widgets/links.widget.ts
@@ -23,7 +23,7 @@ export class LinksWidget implements Widget {
     return view.selectAll<SVGGElement, Link>("g.link");
   }
 
-  public revise(selection: Selection<BaseType, Link, SVGElement, any>) {
+  public revise(selection: SVGSelection) {
     const self = this;
 
     selection
@@ -120,7 +120,9 @@ export class LinksWidget implements Widget {
         .attr('map-source', (l: Link) => l.source.node_id)
         .attr('map-target', (l: Link) => l.target.node_id)
 
-    //this.revise(link.merge(link_enter));
+    const merge = link.merge(link_enter);
+
+    this.revise(merge);
 
     link
       .exit()
diff --git a/src/app/cartography/shared/widgets/nodes.widget.ts b/src/app/cartography/shared/widgets/nodes.widget.ts
index 99e7cb23..4066409a 100644
--- a/src/app/cartography/shared/widgets/nodes.widget.ts
+++ b/src/app/cartography/shared/widgets/nodes.widget.ts
@@ -30,7 +30,7 @@ export class NodesWidget implements Widget {
     this.onNodeDraggedCallback = onNodeDraggedCallback;
   }
 
-  public addOnNodeDraggingCallback(onNodeDraggingCallback: (n: Node) => void) {
+  public addOnNodeDraggingCallback(onNodeDraggingCallback: (event: any, n: Node) => void) {
     this.onNodeDraggingCallbacks.push(onNodeDraggingCallback);
   }
 
@@ -38,10 +38,10 @@ export class NodesWidget implements Widget {
     this.symbols = symbols;
   }
 
-  private executeOnNodeDraggingCallback(n: Node) {
-    // this.onNodeDraggingCallbacks.forEach((callback: (n: Node) => void) => {
-    //   callback(n);
-    // });
+  private executeOnNodeDraggingCallback(callback_event: any, node: Node) {
+    this.onNodeDraggingCallbacks.forEach((callback: (e: any, n: Node) => void) => {
+      callback(callback_event, node);
+    });
   }
 
   public revise(selection: SVGSelection) {
@@ -157,7 +157,7 @@ export class NodesWidget implements Widget {
       n.y = e.y;
 
       self.revise(select(this));
-      self.executeOnNodeDraggingCallback(n);
+      self.executeOnNodeDraggingCallback(event, n);
     };
 
     const dragging = () => {