From 6edcf16fff7461e12800a6619488205a5c420470 Mon Sep 17 00:00:00 2001 From: andrewdkim Date: Wed, 12 Feb 2020 20:29:57 -0500 Subject: merge --- src/client/views/GestureOverlay.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/client/views/GestureOverlay.tsx b/src/client/views/GestureOverlay.tsx index 78a5389d2..e8e9e8c28 100644 --- a/src/client/views/GestureOverlay.tsx +++ b/src/client/views/GestureOverlay.tsx @@ -146,13 +146,9 @@ export default class GestureOverlay extends Touchable { const nts = this.getNewTouches(te); if (nts.nt.length < 5) { const target = document.elementFromPoint(te.changedTouches.item(0).clientX, te.changedTouches.item(0).clientY); -<<<<<<< HEAD - target ?.dispatchEvent( -======= te.changedTouches.item(0).identifier; console.log(te.touches); - target?.dispatchEvent( ->>>>>>> 33d5a12af14e1ed50e5c3164b363fbbc253506a0 + target ?.dispatchEvent( new CustomEvent>("dashOnTouchStart", { bubbles: true, @@ -173,7 +169,7 @@ export default class GestureOverlay extends Touchable { const target = document.elementFromPoint(te.changedTouches.item(0).clientX, te.changedTouches.item(0).clientY); let pt: any = te.touches[te.touches.length - 1]; if (nts.nt.length === 1 && pt.radiusX > 1 && pt.radiusY > 1) { - target?.dispatchEvent( + target ?.dispatchEvent( new CustomEvent>("dashOnTouchHoldStart", { bubbles: true, -- cgit v1.2.3-70-g09d2