From 67823f1a7f5d5cde4c307d69576e7c736cdac236 Mon Sep 17 00:00:00 2001
From: thomasbarone <thomas.barone@spectraqest.com>
Date: Wed, 10 Aug 2016 07:44:15 +0930
Subject: [PATCH] Fix issue #1156 (#1976)

Add flag to check whether an item in the Itemset is currently being dragged
---
 lib/timeline/Timeline.js          | 21 +++++++++++++++++++++
 lib/timeline/component/ItemSet.js |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/lib/timeline/Timeline.js b/lib/timeline/Timeline.js
index 6d4ef175..4b7cde2a 100644
--- a/lib/timeline/Timeline.js
+++ b/lib/timeline/Timeline.js
@@ -547,4 +547,25 @@ Timeline.prototype.getEventProperties = function (event) {
   }
 };
 
+ /**
+ * Extend the drag event handler from Core, move the timeline vertically
+ * @param {Event} event
+ * @private
+ */
+  Timeline.prototype._onDrag = function (event) {
+      // refuse to drag when we where pinching to prevent the timeline make a jump
+      // when releasing the fingers in opposite order from the touch screen, and refuse
+      // to drag when an item is already being dragged
+      if (!this.touch.allowDragging || this.itemSet.touchParams.itemIsDragging) return;
+
+      var delta = event.deltaY;
+
+      var oldScrollTop = this._getScrollTop();
+      var newScrollTop = this._setScrollTop(this.touch.initialScrollTop + delta);
+
+      if (newScrollTop != oldScrollTop) {
+          this.emit("verticalDrag");
+      }
+  };
+
 module.exports = Timeline;
diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js
index 373a92f3..381ac011 100644
--- a/lib/timeline/component/ItemSet.js
+++ b/lib/timeline/component/ItemSet.js
@@ -1211,6 +1211,7 @@ ItemSet.prototype._onDragStart = function (event) {
 
     var dragLeftItem = this.touchParams.dragLeftItem;
     var dragRightItem = this.touchParams.dragRightItem;
+    this.touchParams.itemIsDragging = true;
 
     if (dragLeftItem) {
       props = {
@@ -1494,6 +1495,7 @@ ItemSet.prototype._onDragEnd = function (event) {
     var dataset = this.itemsData.getDataSet();
     var itemProps = this.touchParams.itemProps ;
     this.touchParams.itemProps = null;
+    this.touchParams.itemIsDragging = false;
 
     itemProps.forEach(function (props) {
       var id = props.item.id;