From 3e3deda9dc27fb3207676e245a464a203ca9286e Mon Sep 17 00:00:00 2001
From: Tobias P <tobias@unterdemradar.de>
Date: Wed, 13 Sep 2023 14:11:31 +0200
Subject: [PATCH] fixed a bug in custom validation where no error message or
 styles would be shown

---
 src/js/sr2ini.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/js/sr2ini.js b/src/js/sr2ini.js
index 72b6843..6314bb1 100644
--- a/src/js/sr2ini.js
+++ b/src/js/sr2ini.js
@@ -466,6 +466,11 @@ function sortTable() {
 
 // validate a combatant row form by checking for all conditions, including regular HTML5 validation
 function validateCombatant() {
+	// do standard HTML5 form validation first
+	// (makes sure that name is not empty and that all other values are numbers within their individual ranges) 
+	if ( ! $("#combatant-form").get(0).reportValidity() ) {
+		return false;
+	}
 	// get input elements
 	let inputElements = {
 		name: $("#combatant-modal-name").get(0),
@@ -473,29 +478,20 @@ function validateCombatant() {
 		dice: $("#combatant-modal-dice").get(0),
 		rea: $("#combatant-modal-rea").get(0)
 	};
-	// do standard HTML5 form validation first
-	// (makes sure that name is not empty and that all other values are numbers within their individual ranges) 
-	let valid = true;
-	Object.values(inputElements).forEach( input => {
-		if (!input.reportValidity()) { valid = false; }
-	})
-	if (!valid) { return false; }
 	// now for some custom validation; first we need to get the input values
 	let ini = inputElements["ini"].value.trim();
 	let dice = inputElements["dice"].value.trim();
 	let rea = inputElements["rea"].value.trim();
 	// invalidate if ini, dice and rea are all empty
 	if (ini == "" && (dice == "" || rea == "")) {
-		inputElements["ini"].setCustomValidity("Requiring values for ini dice and reaction, or initiative, or all three");
+		inputElements["ini"].setCustomValidity("Values required for either initiative, or dice and reaction, or all three");
 		inputElements["ini"].reportValidity();
-		inputElements["ini"].setCustomValidity("");
 		return false;
 	}
 	// invalidate if dice or rea is empty but not both
 	if ((dice == "") != (rea == "")) {
 		inputElements["dice"].setCustomValidity("Values required for both dice and reaction, or none (in which case ini is required)");
 		inputElements["dice"].reportValidity();
-		inputElements["dice"].setCustomValidity("");
 		return false;
 	}
 	// ok then
@@ -521,6 +517,10 @@ $(document).ready(function () {
 	$("#confirm-modal-remove-combatant-ok-button").on("click", () => {
 		removeCombatant();
 	});
+	// add event handler to certain input elements that removes any custom validity message  
+	$("#combatant-modal-dice #combatant-modal-rea #combatant-modal-ini").on("input", (event) => {
+		event.target.setCustomValidity("");
+	});
 	// add event listeners to damage sliders in combatant modal
 	$("#combatant-modal-stun").on("input change", () => {
 		if ($("#combatant-modal-stun").val() == "10") {
@@ -555,3 +555,5 @@ $(document).ready(function () {
 	});
 	addTestCombatant();
 });
+
+module.exports = { rollForInitiative, validateCombatant, whoGoesFirst, getEffectiveIni };