From 8bb722863a69f915fbe31ae9ec4cdbd01a1569f2 Mon Sep 17 00:00:00 2001
From: Tissevert <tissevert+devel@marvid.fr>
Date: Thu, 16 Jan 2020 16:44:19 +0100
Subject: [PATCH] Fix onClick event issues with River- and HandCards

---
 js/GUI/Card/HandCard.js  | 16 +++++++---------
 js/GUI/Card/RiverCard.js | 20 +++++++++-----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/js/GUI/Card/HandCard.js b/js/GUI/Card/HandCard.js
index b7e1deb..5189be5 100644
--- a/js/GUI/Card/HandCard.js
+++ b/js/GUI/Card/HandCard.js
@@ -7,19 +7,17 @@ return {
 
 function HandCard(name) {
   var card = Card.make(name);
-	card.onClick = onClick;
+	card.dom.addEventListener('click', onClick);
 	return card;
 
 	function onClick() {
-		return function() {
-			if(State.state.playing && State.state.step == "ToPlay") {
-				if(State.getSelected() != undefined) {
-					State.select(false);
-				} else {
-					play();
-				}
+		if(State.state.playing && State.state.step == "ToPlay") {
+			if(State.getSelected() != undefined) {
+				State.select(false);
+			} else {
+				play();
 			}
-		};
+		}
 	}
 
 	function play() {
diff --git a/js/GUI/Card/RiverCard.js b/js/GUI/Card/RiverCard.js
index ccaa48d..9983919 100644
--- a/js/GUI/Card/RiverCard.js
+++ b/js/GUI/Card/RiverCard.js
@@ -8,21 +8,19 @@ return {
 function RiverCard(name) {
 	var card = Card.make(name);
 	var candidate = false;
-	card.onClick = onClick;
+	card.dom.addEventListener('click', onClick);
 	card.setCandidate = setCandidate;
 	return card;
 
 	function onClick() {
-		return function() {
-			if(candidate) {
-				var withCard = State.getSelected().name;
-				State.select(false);
-				State.play(
-					State.state.step == 'ToPlay' ?
-						{capture: [withCard, card.name]} : {choose: card.name}
-				);
-			}
-		};
+		if(candidate) {
+			var withCard = State.getSelected().value.name;
+			State.select(false);
+			State.play(
+				State.state.step == 'ToPlay' ?
+					{capture: [withCard, name]} : {choose: name}
+			);
+		}
 	}
 
 	function setCandidate(yes) {