From d70b3cdf98919c89f1ba481a700d79d84fe3c43d Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sat, 19 Jun 2021 11:38:25 +0200
Subject: tripoli: Show disabled card popup menu items too.

Stable menu items should prevent some mis-clicks.
---
 ui.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'ui.js')

diff --git a/ui.js b/ui.js
index 70798b9..c3f48bc 100644
--- a/ui.js
+++ b/ui.js
@@ -212,7 +212,6 @@ function on_update() {
 
 function update_year_marker(year) {
 	let e = document.getElementById("year");
-	console.log("year", e);
 	e.style.left = Math.round(YEAR_X[year] - 27) + "px";
 	e.style.top = Math.round(YEAR_Y - 27) + "px";
 }
@@ -388,33 +387,33 @@ function hide_popup_menu() {
 }
 
 function on_card_event() {
-	send_action('card_event', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_event', current_popup_card))
+		hide_popup_menu();
 }
 
 function on_card_take() {
-	send_action('card_take', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_take', current_popup_card))
+		hide_popup_menu();
 }
 
 function on_card_move_frigates() {
-	send_action('card_move_frigates', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_move_frigates', current_popup_card))
+		hide_popup_menu();
 }
 
 function on_card_pirate_raid() {
-	send_action('card_pirate_raid', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_pirate_raid', current_popup_card))
+		hide_popup_menu();
 }
 
 function on_card_build_gunboat() {
-	send_action('card_build_gunboat', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_build_gunboat', current_popup_card))
+		hide_popup_menu();
 }
 
 function on_card_build_corsair() {
-	send_action('card_build_corsair', current_popup_card);
-	hide_popup_menu();
+	if (send_action('card_build_corsair', current_popup_card))
+		hide_popup_menu();
 }
 
 function is_card_action(action, card) {
-- 
cgit v1.2.3