From 24ed4dbfef1bd82f9df172b63fece8b5900e2f8e Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alexdemulder@gmail.com>
Date: Tue, 13 Jan 2015 15:58:56 +0100
Subject: [PATCH] - Caught case where click originated on external DOM element
 and drag progressed to vis. #557

---
 HISTORY.md             |  1 +
 dist/vis.js            | 35 +++++++++++++++++++++--------------
 lib/network/Network.js | 35 +++++++++++++++++++++--------------
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 54443fb8..9f21f4c1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -11,6 +11,7 @@ http://visjs.org
 - Fixed dashed lines on firefox on Unix systems
 - Altered the Manipulation Mixin to be succesfully destroyed from memory when calling destroy();
 - Improved drawing of arrowheads on smooth curves. #349
+- Caught case where click originated on external DOM element and drag progressed to vis.
 
 ## 20145-01-09, version 3.8.0
 
diff --git a/dist/vis.js b/dist/vis.js
index 6f0f7c33..8fc6d655 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -23608,8 +23608,8 @@ return /******/ (function(modules) { // webpackBootstrap
    * handle drag start event
    * @private
    */
-  Network.prototype._onDragStart = function () {
-    this._handleDragStart();
+  Network.prototype._onDragStart = function (event) {
+    this._handleDragStart(event);
   };
 
 
@@ -23619,20 +23619,24 @@ return /******/ (function(modules) { // webpackBootstrap
    *
    * @private
    */
-  Network.prototype._handleDragStart = function() {
-    var drag = this.drag;
-    var node = this._getNodeAt(drag.pointer);
+  Network.prototype._handleDragStart = function(event) {
+    // in case the touch event was triggered on an external div, do the initial touch now.
+    if (this.drag.pointer === undefined) {
+      this._onTouch(event);
+    }
+
+    var node = this._getNodeAt(this.drag.pointer);
     // note: drag.pointer is set in _onTouch to get the initial touch location
 
-    drag.dragging = true;
-    drag.selection = [];
-    drag.translation = this._getTranslation();
-    drag.nodeId = null;
+    this.drag.dragging = true;
+    this.drag.selection = [];
+    this.drag.translation = this._getTranslation();
+    this.drag.nodeId = null;
     this.draggingNodes = false;
 
     if (node != null && this.constants.dragNodes == true) {
       this.draggingNodes = true;
-      drag.nodeId = node.id;
+      this.drag.nodeId = node.id;
       // select the clicked node if not yet selected
       if (!node.isSelected()) {
         this._selectObject(node,false);
@@ -23658,7 +23662,7 @@ return /******/ (function(modules) { // webpackBootstrap
           object.xFixed = true;
           object.yFixed = true;
 
-          drag.selection.push(s);
+          this.drag.selection.push(s);
         }
       }
     }
@@ -23718,8 +23722,13 @@ return /******/ (function(modules) { // webpackBootstrap
       }
     }
     else {
+      // move the network
       if (this.constants.dragNetwork == true) {
-        // move the network
+        // if the drag was not started properly because the click started outside the network div, start it now.
+        if (this.drag.pointer === undefined) {
+          this._handleDragStart(event);
+          return;
+        }
         var diffX = pointer.x - this.drag.pointer.x;
         var diffY = pointer.y - this.drag.pointer.y;
 
@@ -23728,8 +23737,6 @@ return /******/ (function(modules) { // webpackBootstrap
           this.drag.translation.y + diffY
         );
         this._redraw();
-  //      this.moving = true;
-  //      this.start();
       }
     }
   };
diff --git a/lib/network/Network.js b/lib/network/Network.js
index f0eec8c7..8f66b8a5 100644
--- a/lib/network/Network.js
+++ b/lib/network/Network.js
@@ -921,8 +921,8 @@ Network.prototype._onTouch = function (event) {
  * handle drag start event
  * @private
  */
-Network.prototype._onDragStart = function () {
-  this._handleDragStart();
+Network.prototype._onDragStart = function (event) {
+  this._handleDragStart(event);
 };
 
 
@@ -932,20 +932,24 @@ Network.prototype._onDragStart = function () {
  *
  * @private
  */
-Network.prototype._handleDragStart = function() {
-  var drag = this.drag;
-  var node = this._getNodeAt(drag.pointer);
+Network.prototype._handleDragStart = function(event) {
+  // in case the touch event was triggered on an external div, do the initial touch now.
+  if (this.drag.pointer === undefined) {
+    this._onTouch(event);
+  }
+
+  var node = this._getNodeAt(this.drag.pointer);
   // note: drag.pointer is set in _onTouch to get the initial touch location
 
-  drag.dragging = true;
-  drag.selection = [];
-  drag.translation = this._getTranslation();
-  drag.nodeId = null;
+  this.drag.dragging = true;
+  this.drag.selection = [];
+  this.drag.translation = this._getTranslation();
+  this.drag.nodeId = null;
   this.draggingNodes = false;
 
   if (node != null && this.constants.dragNodes == true) {
     this.draggingNodes = true;
-    drag.nodeId = node.id;
+    this.drag.nodeId = node.id;
     // select the clicked node if not yet selected
     if (!node.isSelected()) {
       this._selectObject(node,false);
@@ -971,7 +975,7 @@ Network.prototype._handleDragStart = function() {
         object.xFixed = true;
         object.yFixed = true;
 
-        drag.selection.push(s);
+        this.drag.selection.push(s);
       }
     }
   }
@@ -1031,8 +1035,13 @@ Network.prototype._handleOnDrag = function(event) {
     }
   }
   else {
+    // move the network
     if (this.constants.dragNetwork == true) {
-      // move the network
+      // if the drag was not started properly because the click started outside the network div, start it now.
+      if (this.drag.pointer === undefined) {
+        this._handleDragStart(event);
+        return;
+      }
       var diffX = pointer.x - this.drag.pointer.x;
       var diffY = pointer.y - this.drag.pointer.y;
 
@@ -1041,8 +1050,6 @@ Network.prototype._handleOnDrag = function(event) {
         this.drag.translation.y + diffY
       );
       this._redraw();
-//      this.moving = true;
-//      this.start();
     }
   }
 };