Merge pull request #68 from YottaSecond/master

Add multitouch support

Author: STRML

lib/draggable.js

@@ -81,7 +81,7 @@ var dragEventFor = eventsFor.mouse;
  * get {clientX, clientY} positions of control
  * */
 function getControlPosition(e) {
-  var position = (e.touches && e.touches[0]) || e;
+  var position = (e.targetTouches && e.targetTouches[0]) || e;
   return {
     clientX: position.clientX,
     clientY: position.clientY
@@ -514,6 +514,11 @@ module.exports = React.createClass({
   },
 
   handleDragStart: function (e) {
+    // Set touch identifier in component state if this is a touch event
+    if(e.targetTouches){
+      this.setState({touchIdentifier: e.targetTouches[0].identifier});
+    }
+    
     // Make it possible to attach event handlers on top of this one
     this.props.onMouseDown(e);
 
@@ -557,6 +562,11 @@ module.exports = React.createClass({
       return;
     }
 
+    // Short circuit if this is not the correct touch event
+    if(e.changedTouches && (e.changedTouches[0].identifier != this.state.touchIdentifier)){
+     return;
+    } 
+
     removeUserSelectStyles(this);
 
     // Turn off dragging
@@ -574,6 +584,10 @@ module.exports = React.createClass({
   },
 
   handleDrag: function (e) {
+    // Return if this is a touch event, but not the correct one for this element
+    if(e.targetTouches && (e.targetTouches[0].identifier != this.state.touchIdentifier)){
+      return;
+    }
     var dragPoint = getControlPosition(e);
 
     // Calculate X and Y