Fix: bugs, cleanup.
This commit is contained in:
24
static/dist/js/main.bundle.js
vendored
24
static/dist/js/main.bundle.js
vendored
@@ -1467,7 +1467,7 @@ class TableBasePage extends BasePage {
|
||||
idCommandCategory = command[attrIdCommandCategory];
|
||||
}
|
||||
} else {
|
||||
idCommandCategory = Number(valueCurrentCommandCategoryFilter);
|
||||
idCommandCategory = parseInt(valueCurrentCommandCategoryFilter);
|
||||
}
|
||||
return idCommandCategory;
|
||||
}
|
||||
@@ -1483,7 +1483,7 @@ 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() {
|
||||
@@ -1778,7 +1778,7 @@ 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);
|
||||
@@ -1887,6 +1887,7 @@ class PageMtgGame extends TableBasePage {
|
||||
if (damage[flagActive] && (damage[flagCommanderDeaths] > 0 || damage[flagLifeGain] != 0 || damage[flagLifeLoss] != 0 || damage[flagIsEliminated])
|
||||
// && rounds.filter(r => r[attrRoundId] == damage[attrRoundId])[0][flagDisplayOrder] <= currentRoundDisplayOrder
|
||||
&& previousRoundIds.includes(damage[attrRoundId])) {
|
||||
debugger;
|
||||
let round = rounds.filter(r => r[attrRoundId] == damage[attrRoundId])[0];
|
||||
let player = players.filter(p => p[attrPlayerId] == damage[attrPlayerId])[0];
|
||||
let receivedFromPlayer = damage[attrReceivedFromCommanderPlayerId] == null ? {
|
||||
@@ -1942,7 +1943,7 @@ 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();
|
||||
@@ -1997,7 +1998,7 @@ 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);
|
||||
@@ -2019,7 +2020,8 @@ class PageMtgGame extends TableBasePage {
|
||||
// Life gain buttons
|
||||
let lifeGainButtonSelector = '.life-gain-btn';
|
||||
Events.hookupEventHandler("click", lifeGainButtonSelector, (event, button) => {
|
||||
const playerId = button.dataset.playerId;
|
||||
debugger;
|
||||
const playerId = parseInt(button.dataset.playerId);
|
||||
const amount = parseInt(button.dataset.amount);
|
||||
const activeRoundId = PageMtgGame.getActiveRoundId();
|
||||
const damageIndex = damageRecords.findIndex(damage => damage[attrRoundId] == activeRoundId && damage[attrPlayerId] == playerId && damage[attrReceivedFromCommanderPlayerId] == null);
|
||||
@@ -2034,7 +2036,7 @@ 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 => damage[attrRoundId] == activeRoundId && damage[attrPlayerId] == playerId && damage[attrReceivedFromCommanderPlayerId] == null);
|
||||
@@ -2049,7 +2051,7 @@ 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);
|
||||
@@ -2058,8 +2060,8 @@ 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);
|
||||
@@ -2068,7 +2070,7 @@ 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);
|
||||
});
|
||||
}
|
||||
|
||||
2
static/dist/js/main.bundle.js.map
vendored
2
static/dist/js/main.bundle.js.map
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user