From 4b9f145df61e7996f624b4cfe0cf98cd467a95f7 Mon Sep 17 00:00:00 2001 From: Tobias P Date: Wed, 13 Sep 2023 10:03:52 +0200 Subject: [PATCH] improved event handling for damage sliders in modal removed debug console output --- src/js/sr2ini.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/sr2ini.js b/src/js/sr2ini.js index 2659d26..72b6843 100644 --- a/src/js/sr2ini.js +++ b/src/js/sr2ini.js @@ -236,7 +236,6 @@ function handleDamageLevelClick(event) { damageLevel += 1; } let damageType = $btn.attr("class").split(" ").filter(cls => cls.substr(0, 7) == "damage-" ? cls : false).toString().substr(7); -console.log("damageType is", damageType); // add damage level to table row as as data attribute $btn.parents("tr.combatant-row").attr("data-damage-" + damageType, damageLevel); // select/unselect damage buttons above/below @@ -368,9 +367,7 @@ function editCombatant() { ini = (ini != "") ? ini : rollForInitiative(dice, rea); // get correct row let index = parseInt($("#combatant-modal").data("row")); -console.log("row index is", index); let $tr = $("tr.combatant-row").eq(index); -console.log("row is", $tr); // set new values $tr.attr("data-true-ini", ini); $tr.find(".combatant-name").text(name); @@ -525,21 +522,24 @@ $(document).ready(function () { removeCombatant(); }); // add event listeners to damage sliders in combatant modal - $("#combatant-modal-stun").on("change", () => { + $("#combatant-modal-stun").on("input change", () => { if ($("#combatant-modal-stun").val() == "10") { $("#combatant-modal-penalty-stun").text("(K.O.)"); + } else if ($("#combatant-modal-stun").val() == "0") { + $("#combatant-modal-penalty-stun").text(""); } else { $("#combatant-modal-penalty-stun").text("(wound penalty -" + DAMAGE_PENALTY[$("#combatant-modal-stun").val()] + ")"); } }); - $("#combatant-modal-physical").on("change", () => { + $("#combatant-modal-physical").on("input change", () => { if ($("#combatant-modal-physical").val() == "10") { $("#combatant-modal-penalty-physical").text("(dead)"); + } else if ($("#combatant-modal-physical").val() == "0") { + $("#combatant-modal-penalty-physical").text(""); } else { $("#combatant-modal-penalty-physical").text("(wound penalty -" + DAMAGE_PENALTY[$("#combatant-modal-physical").val()] + ")"); } }); - // always focus name input field when combatant modal appears $('#combatant-modal').on('shown.bs.modal', () => $('#combatant-modal-name').focus()); // always empty input fields when combatant modal disappears