summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-27 19:32:35 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-27 19:32:35 +0900
commit103fe8b91de036613425ec5d39e5c21c38a6a0ee (patch)
tree9f2ec97e3218c3e9d038bd4ceb568a33681c5d1a /src/client
parentMerge pull request #3998 from syuilo/l10n_develop (diff)
downloadsharkey-103fe8b91de036613425ec5d39e5c21c38a6a0ee.tar.gz
sharkey-103fe8b91de036613425ec5d39e5c21c38a6a0ee.tar.bz2
sharkey-103fe8b91de036613425ec5d39e5c21c38a6a0ee.zip
[MFM] Resolve #4009
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/mfm.ts9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index 542f1e34c5..1cf7752cbd 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -128,9 +128,16 @@ export default Vue.component('misskey-flavored-markdown', {
motionCount++;
const isLong = sumTextsLength(token.children) > 5 || countNodesF(token.children) > 3;
const isMany = motionCount > 3;
+ const direction =
+ token.node.props.attr == 'left' ? 'reverse' :
+ token.node.props.attr == 'alternate' ? 'alternate' :
+ 'normal';
+ const style = (this.$store.state.settings.disableAnimatedMfm || isLong || isMany)
+ ? ''
+ : `animation: spin 1.5s linear infinite; animation-direction: ${direction};`;
return (createElement as any)('span', {
attrs: {
- style: (this.$store.state.settings.disableAnimatedMfm || isLong || isMany) ? 'display: inline-block;' : 'display: inline-block; animation: spin 1.5s linear infinite;'
+ style: 'display: inline-block;' + style
},
}, genEl(token.children));
}