mirror of
https://github.com/Pandipipas/scoreko-dev.git
synced 2026-06-06 03:32:06 +00:00
Fix custom player id leaking in scoreboard input
This commit is contained in:
@@ -70,10 +70,38 @@ const playerOptions = computed(() => {
|
|||||||
return base.concat(options);
|
return base.concat(options);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const leftPlayerOptions = computed(() => {
|
||||||
|
const options = filterOptions(playerOptions.value, leftFilter.value);
|
||||||
|
if (scoreboardStore.scoreboard.leftPlayerId !== CUSTOM_LEFT_PLAYER_ID) {
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
return [{
|
||||||
|
value: CUSTOM_LEFT_PLAYER_ID,
|
||||||
|
label: scoreboardStore.scoreboard.leftNameOverride || '(Sin asignar)',
|
||||||
|
}].concat(options);
|
||||||
|
});
|
||||||
|
|
||||||
|
const rightPlayerOptions = computed(() => {
|
||||||
|
const options = filterOptions(playerOptions.value, rightFilter.value);
|
||||||
|
if (scoreboardStore.scoreboard.rightPlayerId !== CUSTOM_RIGHT_PLAYER_ID) {
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
return [{
|
||||||
|
value: CUSTOM_RIGHT_PLAYER_ID,
|
||||||
|
label: scoreboardStore.scoreboard.rightNameOverride || '(Sin asignar)',
|
||||||
|
}].concat(options);
|
||||||
|
});
|
||||||
|
|
||||||
const leftSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.leftPlayerId]);
|
const leftSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.leftPlayerId]);
|
||||||
const rightSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.rightPlayerId]);
|
const rightSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.rightPlayerId]);
|
||||||
|
|
||||||
const getPlayerLabel = (playerId: string) => {
|
const getPlayerLabel = (playerId: string) => {
|
||||||
|
if (playerId === CUSTOM_LEFT_PLAYER_ID) {
|
||||||
|
return scoreboardStore.scoreboard.leftNameOverride;
|
||||||
|
}
|
||||||
|
if (playerId === CUSTOM_RIGHT_PLAYER_ID) {
|
||||||
|
return scoreboardStore.scoreboard.rightNameOverride;
|
||||||
|
}
|
||||||
const match = playerOptions.value.find((option) => option.value === playerId);
|
const match = playerOptions.value.find((option) => option.value === playerId);
|
||||||
return match ? match.label : '';
|
return match ? match.label : '';
|
||||||
};
|
};
|
||||||
@@ -135,10 +163,6 @@ const rightHasSelectedPlayerChanges = computed(() => {
|
|||||||
|| player.country !== scoreboardStore.scoreboard.rightCountryOverride;
|
|| player.country !== scoreboardStore.scoreboard.rightCountryOverride;
|
||||||
});
|
});
|
||||||
|
|
||||||
const leftPlayerOptions = computed(() => filterOptions(playerOptions.value, leftFilter.value));
|
|
||||||
const rightPlayerOptions = computed(() => filterOptions(playerOptions.value, rightFilter.value));
|
|
||||||
|
|
||||||
|
|
||||||
const startLeftCustomPlayer = () => {
|
const startLeftCustomPlayer = () => {
|
||||||
const wasCustom = scoreboardStore.scoreboard.leftPlayerId === CUSTOM_LEFT_PLAYER_ID;
|
const wasCustom = scoreboardStore.scoreboard.leftPlayerId === CUSTOM_LEFT_PLAYER_ID;
|
||||||
scoreboardStore.scoreboard.leftPlayerId = CUSTOM_LEFT_PLAYER_ID;
|
scoreboardStore.scoreboard.leftPlayerId = CUSTOM_LEFT_PLAYER_ID;
|
||||||
|
|||||||
Reference in New Issue
Block a user