diff --git a/‎src/standard/gestures.html‎
Lines changed: 16 additions & 2 deletions b/‎src/standard/gestures.html‎
Lines changed: 16 additions & 2 deletions
diff --git a/‎test/unit/gestures.html‎
Lines changed: 1 addition & 2 deletions b/‎test/unit/gestures.html‎
Lines changed: 1 addition & 2 deletions
@@ -231,10 +231,10 @@
             }
           }
           // disable synth mouse events, unless this event is itself simulated
-          if (type === 'touchend' && !ev.__polymerSimulatedTouch) {
+          if (type === 'touchend') {
             POINTERSTATE.mouse.target = Polymer.dom(ev).rootTarget;
             // ignore syntethic mouse events after a touch
-            ignoreMouse(true);
+            ignoreMouse();
           }
         }
       }
@@ -404,6 +404,20 @@
       if (recognizer.info) {
         recognizer.info.prevent = true;
       }
+    },
+    /**
+     * Reset the 2500ms timeout on processing mouse input after detecting touch input.
+     *
+     * Touch inputs create synthesized mouse inputs anywhere from 0 to 2000ms after the touch.
+     * This method should only be called during testing with simulated touch inputs.
+     * Calling this method in production may cause duplicate taps or other gestures.
+     *
+     * @method resetMouseCanceller
+     */
+    resetMouseCanceller: function() {
+      if (POINTERSTATE.mouse.mouseIgnoreJob) {
+        POINTERSTATE.mouse.mouseIgnoreJob.complete();
+      }
     }
   };
 
 
@@ -256,6 +256,7 @@
       });
       teardown(function() {
         el.parentNode.removeChild(el);
+        Polymer.Gestures.resetMouseCanceller();
       });
 
       test('tap', function() {
@@ -313,7 +314,6 @@
         ];
         ev.clientX = clientX;
         ev.clientY = clientY;
-        ev.__polymerSimulatedTouch = true;
         child.dispatchEvent(ev);
 
         for (var i = 0; i < 10; i++) {
@@ -330,7 +330,6 @@
           ev.clientX = clientX;
           ev.clientY = clientY;
           // tell gestures to not turn off mouse events
-          ev.__polymerSimulatedTouch = true;
           child.dispatchEvent(ev);
         }
Original file line number	Diff line number	Diff line change
`@@ -231,10 +231,10 @@`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`// disable synth mouse events, unless this event is itself simulated`
`234`		`- if (type === 'touchend' && !ev.__polymerSimulatedTouch) {`
	`234`	`+ if (type === 'touchend') {`
`235`	`235`	`POINTERSTATE.mouse.target = Polymer.dom(ev).rootTarget;`
`236`	`236`	`// ignore syntethic mouse events after a touch`
`237`		`- ignoreMouse(true);`
	`237`	`+ ignoreMouse();`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`}`
`@@ -404,6 +404,20 @@`
`404`	`404`	`if (recognizer.info) {`
`405`	`405`	`recognizer.info.prevent = true;`
`406`	`406`	`}`
	`407`	`+ },`
	`408`	`+ /**`
	`409`	`+ * Reset the 2500ms timeout on processing mouse input after detecting touch input.`
	`410`	`+ *`
	`411`	`+ * Touch inputs create synthesized mouse inputs anywhere from 0 to 2000ms after the touch.`
	`412`	`+ * This method should only be called during testing with simulated touch inputs.`
	`413`	`+ * Calling this method in production may cause duplicate taps or other gestures.`
	`414`	`+ *`
	`415`	`+ * @method resetMouseCanceller`
	`416`	`+ */`
	`417`	`+ resetMouseCanceller: function() {`
	`418`	`+ if (POINTERSTATE.mouse.mouseIgnoreJob) {`
	`419`	`+ POINTERSTATE.mouse.mouseIgnoreJob.complete();`
	`420`	`+ }`
`407`	`421`	`}`
`408`	`422`	`};`
`409`	`423`