diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-30 09:07:15 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-30 09:07:15 +0900 |
| commit | 7d842c1a95e28af445c30ca47fb96479b3301456 (patch) | |
| tree | 920a77a730ed134cc0ee585cb812c77aa4894ead /packages/frontend/src | |
| parent | refactor(frontend): refactor base styles (diff) | |
| download | sharkey-7d842c1a95e28af445c30ca47fb96479b3301456.tar.gz sharkey-7d842c1a95e28af445c30ca47fb96479b3301456.tar.bz2 sharkey-7d842c1a95e28af445c30ca47fb96479b3301456.zip | |
fix(frontend): avoid naming confliction of MkAd
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/components/global/MkAd.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/pages/chat/home.home.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/flash/flash.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/gallery/post.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/page.vue | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index b55069ca25..29b2ce0487 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -53,7 +53,7 @@ import { prefer } from '@/preferences.js'; type Ad = (typeof instance)['ads'][number]; const props = defineProps<{ - prefer: string[]; + preferForms: string[]; specify?: Ad; }>(); @@ -72,7 +72,7 @@ const choseAd = (): Ad | null => { ratio: 0, } : ad); - let ads = allAds.filter(ad => props.prefer.includes(ad.place)); + let ads = allAds.filter(ad => props.preferForms.includes(ad.place)); if (ads.length === 0) { ads = allAds.filter(ad => ad.place === 'square'); diff --git a/packages/frontend/src/pages/chat/home.home.vue b/packages/frontend/src/pages/chat/home.home.vue index 007e9fc1f4..49857db9ab 100644 --- a/packages/frontend/src/pages/chat/home.home.vue +++ b/packages/frontend/src/pages/chat/home.home.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkInfo v-else>{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}</MkInfo> - <MkAd :prefer="['horizontal', 'horizontal-big']"/> + <MkAd :preferForms="['horizontal', 'horizontal-big']"/> <MkInput v-model="searchQuery" diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue index 041633c2cf..2873822573 100644 --- a/packages/frontend/src/pages/flash/flash.vue +++ b/packages/frontend/src/pages/flash/flash.vue @@ -51,7 +51,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </div> <MkA v-if="$i && $i.id === flash.userId" :to="`/play/${flash.id}/edit`" style="color: var(--MI_THEME-accent);">{{ i18n.ts._play.editThisPage }}</MkA> - <MkAd :prefer="['horizontal', 'horizontal-big']"/> + <MkAd :preferForms="['horizontal', 'horizontal-big']"/> </div> <MkError v-else-if="error" @retry="fetchFlash()"/> <MkLoading v-else/> diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue index 81d553c035..6b37a0b470 100644 --- a/packages/frontend/src/pages/gallery/post.vue +++ b/packages/frontend/src/pages/gallery/post.vue @@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkFollowButton v-if="!$i || $i.id != post.user.id" v-model:user="post.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/> </div> </div> - <MkAd :prefer="['horizontal', 'horizontal-big']"/> + <MkAd :preferForms="['horizontal', 'horizontal-big']"/> <MkContainer :max-height="300" :foldable="true" class="other"> <template #icon><i class="ti ti-clock"></i></template> <template #header>{{ i18n.ts.recentPosts }}</template> diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue index b684d4b68b..6c2eced4e6 100644 --- a/packages/frontend/src/pages/page.vue +++ b/packages/frontend/src/pages/page.vue @@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only <div v-if="page.createdAt != page.updatedAt"><i class="ti ti-clock-edit"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div> </div> </div> - <MkAd :prefer="['horizontal', 'horizontal-big']"/> + <MkAd :preferForms="['horizontal', 'horizontal-big']"/> <MkContainer :max-height="300" :foldable="true" class="other"> <template #icon><i class="ti ti-clock"></i></template> <template #header>{{ i18n.ts.recentPosts }}</template> |