summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-07-29 10:44:04 +0000
committerdakkar <dakkar@thenautilus.net>2024-07-29 10:44:04 +0000
commitcc48b26c1b72cd0f6c9c7570f5fde3869a5293d7 (patch)
tree49d8db05b1c5ebfe570836a4ba8fa8a287336a38 /packages/frontend/src/components
parentmerge: only require alt-text on image/video/audio - fixes #536 (!569) (diff)
parentrename our components - fixes #534 (diff)
downloadsharkey-cc48b26c1b72cd0f6c9c7570f5fde3869a5293d7.tar.gz
sharkey-cc48b26c1b72cd0f6c9c7570f5fde3869a5293d7.tar.bz2
sharkey-cc48b26c1b72cd0f6c9c7570f5fde3869a5293d7.zip
merge: rename our components - fixes #534 (!563)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/563 Closes #534 Approved-by: Marie <marie@kaifa.ch> Approved-by: Tess K <me@thvxl.se>
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkMediaList.vue2
-rw-r--r--packages/frontend/src/components/MkPostForm.vue2
-rw-r--r--packages/frontend/src/components/SkFormula.vue (renamed from packages/frontend/src/components/MkFormula.vue)0
-rw-r--r--packages/frontend/src/components/SkMfmWindow.vue (renamed from packages/frontend/src/components/MkMfmWindow.vue)0
-rw-r--r--packages/frontend/src/components/SkModPlayer.vue (renamed from packages/frontend/src/components/MkModPlayer.vue)0
-rw-r--r--packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts6
6 files changed, 5 insertions, 5 deletions
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index 3bf44aea8e..112a84f1fd 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -37,7 +37,7 @@ import 'photoswipe/style.css';
import XBanner from '@/components/MkMediaBanner.vue';
import XImage from '@/components/MkMediaImage.vue';
import XVideo from '@/components/MkMediaVideo.vue';
-import XModPlayer from '@/components/MkModPlayer.vue';
+import XModPlayer from '@/components/SkModPlayer.vue';
import * as os from '@/os.js';
import { FILE_TYPE_BROWSERSAFE, FILE_EXT_TRACKER_MODULES, FILE_TYPE_TRACKER_MODULES } from '@/const.js';
import { defaultStore } from '@/store.js';
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 4baaa81ef3..78df70ca5c 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -372,7 +372,7 @@ function watchForDraft() {
}
function MFMWindow() {
- os.popup(defineAsyncComponent(() => import('@/components/MkMfmWindow.vue')), {}, {}, 'closed');
+ os.popup(defineAsyncComponent(() => import('@/components/SkMfmWindow.vue')), {}, {}, 'closed');
}
function checkMissingMention() {
diff --git a/packages/frontend/src/components/MkFormula.vue b/packages/frontend/src/components/SkFormula.vue
index 039cef8da8..039cef8da8 100644
--- a/packages/frontend/src/components/MkFormula.vue
+++ b/packages/frontend/src/components/SkFormula.vue
diff --git a/packages/frontend/src/components/MkMfmWindow.vue b/packages/frontend/src/components/SkMfmWindow.vue
index c599531ec5..c599531ec5 100644
--- a/packages/frontend/src/components/MkMfmWindow.vue
+++ b/packages/frontend/src/components/SkMfmWindow.vue
diff --git a/packages/frontend/src/components/MkModPlayer.vue b/packages/frontend/src/components/SkModPlayer.vue
index 58a96cfb63..58a96cfb63 100644
--- a/packages/frontend/src/components/MkModPlayer.vue
+++ b/packages/frontend/src/components/SkModPlayer.vue
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 762f921a7c..ac563ffaf5 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -80,7 +80,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
const isBlock = props.isBlock ?? false;
- const MkFormula = defineAsyncComponent(() => import('@/components/MkFormula.vue'));
+ const SkFormula = defineAsyncComponent(() => import('@/components/SkFormula.vue'));
/**
* Gen Vue Elements from MFM AST
@@ -499,14 +499,14 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
}
case 'mathInline': {
- return [h('bdi', h(MkFormula, {
+ return [h('bdi', h(SkFormula, {
formula: token.props.formula,
block: false,
}))];
}
case 'mathBlock': {
- return [h('bdi', { class: 'block' }, h(MkFormula, {
+ return [h('bdi', { class: 'block' }, h(SkFormula, {
formula: token.props.formula,
block: true,
}))];