Fix: bugs, cleanup.

This commit is contained in:
2026-02-17 15:38:18 +00:00
parent 5661632540
commit c7db290aaf
5 changed files with 65 additions and 27 deletions

View File

@@ -674,7 +674,7 @@ export default class TableBasePage extends BasePage {
idCommandCategory = command[attrIdCommandCategory];
}
} else {
idCommandCategory = Number(valueCurrentCommandCategoryFilter);
idCommandCategory = parseInt(valueCurrentCommandCategoryFilter);
}
return idCommandCategory;
}
@@ -690,7 +690,7 @@ export default class TableBasePage extends BasePage {
let formFilters = TableBasePage.getFormFilters();
let commandFilter = formFilters.querySelector('#' + attrIdCommand);
let valueCurrentCommandFilter = DOM.getElementAttributeValueCurrent(commandFilter);
let idCommand = Number(valueCurrentCommandFilter);
let idCommand = parseInt(valueCurrentCommandFilter);
return idCommand;
}
getHasCommandFilter() {

View File

@@ -198,7 +198,7 @@ export default class PageMtgGame extends TableBasePage {
// let activeRoundId = PageMtgGame.getActiveRoundId();
const roundDisplayOrderLabel = PageMtgGame.getRoundDisplayOrderLabel();
const currentRoundDisplayOrder = Number(DOM.getElementValueCurrent(roundDisplayOrderLabel));
const currentRoundDisplayOrder = parseInt(DOM.getElementValueCurrent(roundDisplayOrderLabel));
let activeRound = rounds.filter(round => round[flagDisplayOrder] == currentRoundDisplayOrder)[0];
if (activeRound == null) {
activeRound = PageMtgGame.makeDefaultGameRound(currentRoundDisplayOrder);
@@ -402,7 +402,7 @@ export default class PageMtgGame extends TableBasePage {
}
static getActiveRoundDisplayOrder() {
const roundDisplayOrderLabel = PageMtgGame.getRoundDisplayOrderLabel();
return Number(DOM.getElementValueCurrent(roundDisplayOrderLabel));
return parseInt(DOM.getElementValueCurrent(roundDisplayOrderLabel));
}
static getActiveRoundId() {
const currentRoundDisplayOrder = PageMtgGame.getActiveRoundDisplayOrder();
@@ -464,7 +464,7 @@ export default class PageMtgGame extends TableBasePage {
const amount = button.classList.contains(flagRoundDisplayOrderPlus) ? 1 : -1;
const roundDisplayOrderButtonContainer = button.parentElement;
const roundDisplayOrderLabel = roundDisplayOrderButtonContainer.querySelector('span.' + flagRound + '.' + flagDisplayOrder);
const currentRoundDisplayOrder = Number(DOM.getElementValueCurrent(roundDisplayOrderLabel));
const currentRoundDisplayOrder = parseInt(DOM.getElementValueCurrent(roundDisplayOrderLabel));
const newDisplayOrder = currentRoundDisplayOrder + amount;
DOM.setElementValueCurrent(roundDisplayOrderLabel, newDisplayOrder);
DOM.isElementDirty(roundDisplayOrderLabel);
@@ -486,7 +486,7 @@ export default class PageMtgGame extends TableBasePage {
// Life gain buttons
let lifeGainButtonSelector = '.life-gain-btn';
Events.hookupEventHandler("click", lifeGainButtonSelector, (event, button) => {
const playerId = button.dataset.playerId;
const playerId = parseInt(button.dataset.playerId);
const amount = parseInt(button.dataset.amount);
const activeRoundId = PageMtgGame.getActiveRoundId();
const damageIndex = damageRecords.findIndex(damage => (
@@ -506,7 +506,7 @@ export default class PageMtgGame extends TableBasePage {
// Life loss buttons
let lifeLossButtonSelector = '.life-loss-btn';
Events.hookupEventHandler("click", lifeLossButtonSelector, (event, button) => {
const playerId = button.dataset.playerId;
const playerId = parseInt(button.dataset.playerId);
const amount = parseInt(button.dataset.amount);
const activeRoundId = PageMtgGame.getActiveRoundId();
const damageIndex = damageRecords.findIndex(damage => (
@@ -526,7 +526,7 @@ export default class PageMtgGame extends TableBasePage {
// Commander death buttons
let commanderDeathButtonSelector = '.death-btn';
Events.hookupEventHandler("click", commanderDeathButtonSelector, (event, button) => {
const playerId = button.dataset.playerId;
const playerId = parseInt(button.dataset.playerId);
const isMinusButton = button.classList.contains('death-minus');
const amount = (isMinusButton) ? -1 : 1;
this.changeCommanderDeaths(playerId, amount);
@@ -535,8 +535,8 @@ export default class PageMtgGame extends TableBasePage {
// Commander damage buttons
let commmanderDamageButtonSelector = '.damage-btn';
Events.hookupEventHandler("click", commmanderDamageButtonSelector, (event, button) => {
const playerId = button.dataset.playerId;
const sourceId = button.dataset.sourceId;
const playerId = parseInt(button.dataset.playerId);
const sourceId = parseInt(button.dataset.sourceId);
const isMinusButton = button.classList.contains('damage-minus');
const amount = (isMinusButton) ? -1 : 1;
this.changeCommanderDamage(playerId, sourceId, amount);
@@ -545,7 +545,7 @@ export default class PageMtgGame extends TableBasePage {
// Eliminate buttons
let eliminatePlayerButtonSelector = '.eliminate-btn';
Events.hookupEventHandler("click", eliminatePlayerButtonSelector, (event, button) => {
const playerId = button.dataset.playerId;
const playerId = parseInt(button.dataset.playerId);
this.toggleEliminate(playerId);
});
}