From 4c955af4c4be0d3c1d002a867c89166811373a9f Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Mon, 6 Apr 2020 21:47:29 +0300
Subject: Skip item confirmation for touch

---
 src/client/Buttons.hx | 3 +--
 src/client/Main.hx    | 1 +
 src/client/Utils.hx   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/client/Buttons.hx b/src/client/Buttons.hx
index 63934e2..2d32d99 100644
--- a/src/client/Buttons.hx
+++ b/src/client/Buttons.hx
@@ -210,8 +210,7 @@ class Buttons {
 	}
 
 	static function onClick(el:Element, func:Any->Void):Void {
-		final isTouch = untyped __js__("'ontouchstart' in window");
-		if (!isTouch) el.onclick = func;
+		if (!Utils.isTouch()) el.onclick = func;
 		else el.ontouchend = func;
 	}
 
diff --git a/src/client/Main.hx b/src/client/Main.hx
index 6c7677b..e5cd58b 100644
--- a/src/client/Main.hx
+++ b/src/client/Main.hx
@@ -122,6 +122,7 @@ class Main {
 		}
 		final voteSkip = ge("#voteskip");
 		voteSkip.onclick = e -> {
+			if (Utils.isTouch() && !Browser.window.confirm(Lang.get("skipItemConfirm"))) return;
 			if (player.isListEmpty()) return;
 			final items = player.getItems();
 			final pos = player.getItemPos();
diff --git a/src/client/Utils.hx b/src/client/Utils.hx
index 69671d2..3ac9953 100644
--- a/src/client/Utils.hx
+++ b/src/client/Utils.hx
@@ -6,6 +6,10 @@ import js.Browser.window;
 
 class Utils {
 
+	public static function isTouch():Bool {
+		return js.Syntax.code("'ontouchstart' in window");
+	}
+
 	public static function prepend(parent:Element, child:Element):Void {
 		if (parent.firstChild == null) parent.appendChild(child);
 		else parent.insertBefore(child, parent.firstChild);
-- 
cgit v1.2.3