summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2020-05-31 12:57:21 +0900
committerGitHub <noreply@github.com>2020-05-31 12:57:21 +0900
commit8d48e4c76e39f5f3bdcd255bdb0418e6b3573533 (patch)
tree69854c5dec22b5ee4f33016550a366579b87c3ad /src
parentfeat(client): 自動でもっと見るオプション (#6403) (diff)
downloadsharkey-8d48e4c76e39f5f3bdcd255bdb0418e6b3573533.tar.gz
sharkey-8d48e4c76e39f5f3bdcd255bdb0418e6b3573533.tar.bz2
sharkey-8d48e4c76e39f5f3bdcd255bdb0418e6b3573533.zip
feat(client): Convert text mfm node to text (v)dom node instead of span tag (#6399)
* Convert text mfm node to text (v)dom node instead of span tag * Update mfm.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'src')
-rw-r--r--src/client/components/mfm.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/components/mfm.ts b/src/client/components/mfm.ts
index bfef80f232..122368f74b 100644
--- a/src/client/components/mfm.ts
+++ b/src/client/components/mfm.ts
@@ -1,5 +1,5 @@
import Vue, { VNode } from 'vue';
-import { MfmForest } from '../../mfm/types';
+import { MfmForest } from '../../mfm/prelude';
import { parse, parsePlain } from '../../mfm/parse';
import MkUrl from './url.vue';
import MkLink from './link.vue';
@@ -53,11 +53,11 @@ export default Vue.component('misskey-flavored-markdown', {
if (!this.plain) {
const x = text.split('\n')
- .map(t => t == '' ? [createElement('br')] : [createElement('span', t), createElement('br')]);
+ .map(t => t == '' ? [createElement('br')] : [this._v(t), createElement('br')]); // NOTE: this._vはHACK SEE: https://github.com/syuilo/misskey/pull/6399#issuecomment-632820283
x[x.length - 1].pop();
return x;
} else {
- return [createElement('span', text.replace(/\n/g, ' '))];
+ return [this._v(text.replace(/\n/g, ' '))];
}
}