From 50e6e433673397ca436b90de2f8417c7cfb0d401 Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alexdemulder@gmail.com>
Date: Tue, 15 Jul 2014 11:17:44 +0200
Subject: [PATCH] fixed drag when zooming per #214

---
 HISTORY.md             |  1 +
 dist/vis.js            | 25 ++++++++++++++++++++-----
 lib/network/Network.js | 25 ++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 4235ed80..64cf6812 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -25,6 +25,7 @@ http://visjs.org
 - Fixed dot radius bug.
 - Updated max velocity of nodes to three times it's original value.
 - Made "stabilized" event fire every time the network stabilizes.
+- Fixed drift in dragging nodes while zooming.
 
 
 
diff --git a/dist/vis.js b/dist/vis.js
index 24ac79f0..ca0bb43d 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -20105,13 +20105,13 @@ return /******/ (function(modules) { // webpackBootstrap
 
     var pointer = this._getPointer(event.gesture.center);
 
-    var me = this,
-      drag = this.drag,
-      selection = drag.selection;
+    var me = this;
+    var drag = this.drag;
+    var selection = drag.selection;
     if (selection && selection.length && this.constants.dragNodes == true) {
       // calculate delta's and new location
-      var deltaX = pointer.x - drag.pointer.x,
-        deltaY = pointer.y - drag.pointer.y;
+      var deltaX = pointer.x - drag.pointer.x;
+      var deltaY = pointer.y - drag.pointer.y;
 
       // update position of all selected nodes
       selection.forEach(function (s) {
@@ -20126,6 +20126,7 @@ return /******/ (function(modules) { // webpackBootstrap
         }
       });
 
+
       // start _animationStep if not yet running
       if (!this.moving) {
         this.moving = true;
@@ -20242,6 +20243,13 @@ return /******/ (function(modules) { // webpackBootstrap
       if (scale > 10) {
         scale = 10;
       }
+
+      var preScaleDragPointer = null;
+      if (this.drag !== undefined) {
+        if (this.drag.dragging == true) {
+          preScaleDragPointer = this.DOMtoCanvas(this.drag.pointer);
+        }
+      }
     // + this.frame.canvas.clientHeight / 2
       var translation = this._getTranslation();
 
@@ -20255,6 +20263,13 @@ return /******/ (function(modules) { // webpackBootstrap
       this._setScale(scale);
       this._setTranslation(tx, ty);
       this.updateClustersDefault();
+
+      if (preScaleDragPointer != null) {
+        var postScaleDragPointer = this.canvasToDOM(preScaleDragPointer);
+        this.drag.pointer.x = postScaleDragPointer.x;
+        this.drag.pointer.y = postScaleDragPointer.y;
+      }
+
       this._redraw();
 
       if (scaleOld < scale) {
diff --git a/lib/network/Network.js b/lib/network/Network.js
index b5fe0601..b9ac51ee 100644
--- a/lib/network/Network.js
+++ b/lib/network/Network.js
@@ -1010,13 +1010,13 @@ Network.prototype._handleOnDrag = function(event) {
 
   var pointer = this._getPointer(event.gesture.center);
 
-  var me = this,
-    drag = this.drag,
-    selection = drag.selection;
+  var me = this;
+  var drag = this.drag;
+  var selection = drag.selection;
   if (selection && selection.length && this.constants.dragNodes == true) {
     // calculate delta's and new location
-    var deltaX = pointer.x - drag.pointer.x,
-      deltaY = pointer.y - drag.pointer.y;
+    var deltaX = pointer.x - drag.pointer.x;
+    var deltaY = pointer.y - drag.pointer.y;
 
     // update position of all selected nodes
     selection.forEach(function (s) {
@@ -1031,6 +1031,7 @@ Network.prototype._handleOnDrag = function(event) {
       }
     });
 
+
     // start _animationStep if not yet running
     if (!this.moving) {
       this.moving = true;
@@ -1147,6 +1148,13 @@ Network.prototype._zoom = function(scale, pointer) {
     if (scale > 10) {
       scale = 10;
     }
+
+    var preScaleDragPointer = null;
+    if (this.drag !== undefined) {
+      if (this.drag.dragging == true) {
+        preScaleDragPointer = this.DOMtoCanvas(this.drag.pointer);
+      }
+    }
   // + this.frame.canvas.clientHeight / 2
     var translation = this._getTranslation();
 
@@ -1160,6 +1168,13 @@ Network.prototype._zoom = function(scale, pointer) {
     this._setScale(scale);
     this._setTranslation(tx, ty);
     this.updateClustersDefault();
+
+    if (preScaleDragPointer != null) {
+      var postScaleDragPointer = this.canvasToDOM(preScaleDragPointer);
+      this.drag.pointer.x = postScaleDragPointer.x;
+      this.drag.pointer.y = postScaleDragPointer.y;
+    }
+
     this._redraw();
 
     if (scaleOld < scale) {