Leahnaya/splatoon3.ink
1
0
Fork 0
mirror of https://github.com/misenhower/splatoon3.ink.git synced 2026-03-21 17:54:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove v-html

Browse Source
This commit is contained in:
Matt Isenhower 2024-03-16 22:41:13 -07:00
parent 8b55a5deba
commit 3e2c31eaa7
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/util.mjs
View File

@ -27,10 +27,6 @@ export function getDateParts(date = null) {
};
}
export function br2nl(str, replace = '\n') {
return str.replace(/<br\s*\/?>/gi, replace);
}
export function getGearIcon(gear) {
switch (gear.gear.__typename) {
case 'HeadGear': return '🧢';

2
app/social/generators/ChallengeStatus.mjs
View File

@ -1,7 +1,7 @@
import StatusGenerator from "./StatusGenerator.mjs";
import Media from "../Media.mjs";
import { useEventSchedulesStore } from "../../../src/stores/schedules.mjs";
import { br2nl } from "../../common/util.mjs";
import { br2nl } from "../../../src/common/util.mjs";
import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs";
export default class ChallengeStatus extends StatusGenerator
{

3
src/common/util.mjs Normal file
View File

@ -0,0 +1,3 @@
export function br2nl(str, replace = '\n') {
return str.replace(/<br\s*\/?>/gi, replace);
}

15
src/components/challenge/ChallengeScheduleBox.vue
View File

@ -7,10 +7,9 @@
<div class="font-splatoon1 lg:text-2xl xl:text-3xl text-shadow">
{{ $t(`splatnet.events.${event.settings.leagueMatchEvent.id}.name`, event.settings.leagueMatchEvent.name) }}
<div
class="font-splatoon2 lg:text-md xl:text-xl text-shadow"
v-html="$t(`splatnet.events.${event.settings.leagueMatchEvent.id}.desc`, event.settings.leagueMatchEvent.desc)"
/>
<div class="font-splatoon2 lg:text-md xl:text-xl text-shadow whitespace-pre-line">
{{ br2nl($t(`splatnet.events.${event.settings.leagueMatchEvent.id}.desc`, event.settings.leagueMatchEvent.desc)) }}
</div>
</div>
</div>
@ -82,10 +81,9 @@
</div>
</div>
<div
class="font-splatoon2 mx-2 p-2 text-zinc-200 bg-zinc-900 bg-opacity-50 backdrop-blur-sm rounded-lg"
v-html="$t(`splatnet.events.${event.settings.leagueMatchEvent.id}.regulation`, event.settings.leagueMatchEvent.regulation)"
/>
<div class="font-splatoon2 mx-2 p-2 text-zinc-200 bg-zinc-900 bg-opacity-50 backdrop-blur-sm rounded-lg whitespace-pre-line">
{{ br2nl($t(`splatnet.events.${event.settings.leagueMatchEvent.id}.regulation`, event.settings.leagueMatchEvent.regulation)) }}
</div>
</div>
</ProductContainer>
</template>
@ -99,6 +97,7 @@ import RuleIcon from '../RuleIcon.vue';
import SquidTape from '../SquidTape.vue';
import { useScheduleTypes } from '../concerns/scheduleTypes.mjs';
import ChallengeScheduleRow from './ChallengeScheduleRow.vue';
import { br2nl } from '../../common/util.mjs';
const props = defineProps({
type: {