From bf2322649a6c38a8e00d23a38a8d2fd999e71be1 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 25 Oct 2022 18:47:14 -0400 Subject: [PATCH] take two on fix for touch + mouse on PC laptops --- src/kiri-mode/cam/client.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index a423e247..e819ce19 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -477,7 +477,9 @@ CAM.init = function(kiri, api) { } } if (moto.space.info.mob) { + let touched = false; el.ontouchstart = (ev) => { + touched = true; if (poppedRec === rec && popped) { onLeave(ev); } else { @@ -486,6 +488,12 @@ CAM.init = function(kiri, api) { }; el.ontouchmove = onDown; el.onmouseenter = (ev) => { + if (touched) { + // touches block mouse events on touchscreen PCs + // which are often sent along with touch events + // but when not touched, allow the mouse to work + return; + } el.onmousedown = onDown; el.onmouseleave = onLeave; onEnter(ev);