summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorSugar <sugar@sylveon.social>2024-06-16 19:07:36 +0200
committerSugar <sugar@sylveon.social>2024-06-17 05:36:10 +0200
commitbe5cda6f6f6e8d984e9a29cd1ce4fd426d54e35d (patch)
tree0109695430a1e604e68ddc2b7137f1fa7e354e4c /packages
parent`followmouse` should be gated by "play animation" button (diff)
downloadsharkey-be5cda6f6f6e8d984e9a29cd1ce4fd426d54e35d.tar.gz
sharkey-be5cda6f6f6e8d984e9a29cd1ce4fd426d54e35d.tar.bz2
sharkey-be5cda6f6f6e8d984e9a29cd1ce4fd426d54e35d.zip
add fade to animated mfm tags
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts3
-rw-r--r--packages/frontend/src/scripts/check-animated-mfm.ts1
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index b562ecb5d0..1bc33585f2 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -235,8 +235,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
return h(MkSparkle, {}, genEl(token.children, scale));
}
case 'fade': {
- // Dont run with reduced motion on
- if (!defaultStore.state.animation) {
+ if (!useAnim) {
style = '';
break;
}
diff --git a/packages/frontend/src/scripts/check-animated-mfm.ts b/packages/frontend/src/scripts/check-animated-mfm.ts
index f7f9b743b6..2614dfb4f1 100644
--- a/packages/frontend/src/scripts/check-animated-mfm.ts
+++ b/packages/frontend/src/scripts/check-animated-mfm.ts
@@ -17,6 +17,7 @@ export function checkAnimationFromMfm(nodes: mfm.MfmNode[]): boolean {
node.props.name === 'bounce' ||
node.props.name === 'rainbow' ||
node.props.name === 'sparkle' ||
+ node.props.name === 'fade' ||
node.props.name === 'followmouse') {
return true;
} else {