Merge pull request #6738 from RandomGamingDev/touchended-fix

Fix for touchEnded triggers twice among other issues with touchEnded/mouseReleased on mobile

src/core/main.js

@@ -205,6 +205,7 @@ class p5 {
     };
     this._millisStart = -1;
     this._recording = false;
+    this.touchend = false;
 
     // States used in the custom random generators
     this._lcg_random_state = null;

src/events/mouse.js

@@ -731,6 +731,12 @@ p5.prototype._onmouseup = function(e) {
   const context = this._isGlobal ? window : this;
   let executeDefault;
   this._setProperty('mouseIsPressed', false);
+
+  // _ontouchend triggers first and sets this.touchend
+  if (this.touchend) {
+    return;
+  }
+
   if (typeof context.mouseReleased === 'function') {
     executeDefault = context.mouseReleased(e);
     if (executeDefault === false) {
@@ -742,6 +748,7 @@ p5.prototype._onmouseup = function(e) {
       e.preventDefault();
     }
   }
+  this.touchend = false;
 };
 
 p5.prototype._ondragend = p5.prototype._onmouseup;

src/events/touch.js

@@ -282,11 +282,7 @@ p5.prototype._ontouchend = function(e) {
     if (executeDefault === false) {
       e.preventDefault();
     }
-  } else if (typeof context.mouseReleased === 'function') {
-    executeDefault = context.mouseReleased(e);
-    if (executeDefault === false) {
-      e.preventDefault();
-    }
+    this.touchend = true;
   }
 };