sort of fixes to mouse and touch

Author: Lauren McCarthy

src/core/p5.Element.js

@@ -188,9 +188,7 @@ p5.Element.prototype.class = function(c) {
  */
 p5.Element.prototype.mousePressed = function (fxn) {
   attachListener('mousedown', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('touchstart', fxn, this);
-  }
+  attachListener('touchstart', fxn, this);
   return this;
 };
 
@@ -305,9 +303,7 @@ p5.Element.prototype.mouseWheel = function (fxn) {
  */
 p5.Element.prototype.mouseReleased = function (fxn) {
   attachListener('mouseup', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('touchend', fxn, this);
-  }
+  attachListener('touchend', fxn, this);
   return this;
 };
 
@@ -414,9 +410,7 @@ p5.Element.prototype.mouseClicked = function (fxn) {
  */
 p5.Element.prototype.mouseMoved = function (fxn) {
   attachListener('mousemove', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('touchmove', fxn, this);
-  }
+  attachListener('touchmove', fxn, this);
   return this;
 };
 
@@ -644,9 +638,7 @@ p5.Element.prototype.mouseOut = function (fxn) {
  */
 p5.Element.prototype.touchStarted = function (fxn) {
   attachListener('touchstart', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('mousedown', fxn, this);
-  }
+  attachListener('mousedown', fxn, this);
   return this;
 };
 
@@ -685,9 +677,7 @@ p5.Element.prototype.touchStarted = function (fxn) {
  */
 p5.Element.prototype.touchMoved = function (fxn) {
   attachListener('touchmove', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('mousemove', fxn, this);
-  }
+  attachListener('mousemove', fxn, this);
   return this;
 };
 
@@ -735,9 +725,7 @@ p5.Element.prototype.touchMoved = function (fxn) {
  */
 p5.Element.prototype.touchEnded = function (fxn) {
   attachListener('touchend', fxn, this);
-  if (!window.PointerEvent) {
-    attachListener('mouseup', fxn, this);
-  }
+  attachListener('mouseup', fxn, this);
   return this;
 };
 

src/events/mouse.js

@@ -350,7 +350,6 @@ p5.prototype.mouseButton = 0;
  *
  */
 p5.prototype.mouseIsPressed = false;
-p5.prototype.isMousePressed = false; // both are supported
 
 p5.prototype._updateNextMouseCoords = function(e) {
   if(this._curElement !== null && (!e.touches || e.touches.length>0)) {
@@ -496,7 +495,7 @@ p5.prototype._onmousemove = function(e){
   var context = this._isGlobal ? window : this;
   var executeDefault;
   this._updateNextMouseCoords(e);
-  if (!this.isMousePressed) {
+  if (!this.mouseIsPressed) {
     if (typeof context.mouseMoved === 'function') {
       executeDefault = context.mouseMoved(e);
       if(executeDefault === false) {
@@ -510,7 +509,7 @@ p5.prototype._onmousemove = function(e){
       if(executeDefault === false) {
         e.preventDefault();
       }
-    } else if (!window.PointerEvent && typeof context.touchMoved === 'function') {
+    } else if (typeof context.touchMoved === 'function') {
       executeDefault = context.touchMoved(e);
       if(executeDefault === false) {
         e.preventDefault();
@@ -577,7 +576,7 @@ p5.prototype._onmousedown = function(e) {
     if(executeDefault === false) {
       e.preventDefault();
     }
-  } else if (!window.PointerEvent && typeof context.touchStarted === 'function') {
+  } else if (typeof context.touchStarted === 'function') {
     executeDefault = context.touchStarted(e);
     if(executeDefault === false) {
       e.preventDefault();
@@ -641,7 +640,7 @@ p5.prototype._onmouseup = function(e) {
     if(executeDefault === false) {
       e.preventDefault();
     }
-  } else if (!window.PointerEvent && typeof context.touchEnded === 'function') {
+  } else if (typeof context.touchEnded === 'function') {
     executeDefault = context.touchEnded(e);
     if(executeDefault === false) {
       e.preventDefault();

src/events/touch.js

@@ -104,7 +104,7 @@ p5.prototype._ontouchstart = function(e) {
     if(executeDefault === false) {
       e.preventDefault();
     }
-  } else if (!window.PointerEvent && typeof context.mousePressed === 'function') {
+  } else if (typeof context.mousePressed === 'function') {
     executeDefault = context.mousePressed(e);
     if(executeDefault === false) {
       e.preventDefault();
@@ -166,7 +166,7 @@ p5.prototype._ontouchmove = function(e) {
     if(executeDefault === false) {
       e.preventDefault();
     }
-  } else if (!window.PointerEvent && typeof context.mouseDragged === 'function') {
+  } else if (typeof context.mouseDragged === 'function') {
     executeDefault = context.mouseDragged(e);
     if(executeDefault === false) {
       e.preventDefault();
@@ -230,7 +230,7 @@ p5.prototype._ontouchend = function(e) {
     if(executeDefault === false) {
       e.preventDefault();
     }
-  } else if (!window.PointerEvent && typeof context.mouseReleased === 'function') {
+  } else if (typeof context.mouseReleased === 'function') {
     executeDefault = context.mouseReleased(e);
     if(executeDefault === false) {
       e.preventDefault();