Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Emoji support in profile (#3514)

Browse source 
* Emoji in profile

* Add emojis to fields
This commit is contained in:
MeiMei 2018-12-06 10:02:04 +09:00 • committed by syuilo
parent fe891da886
commit 4522568749
41 changed files with 261 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/app/common/views/components/mfm.ts
View file

@ -49,6 +49,10 @@ export default Vue.component('misskey-flavored-markdown', {
type: Boolean,
default: true
},
plainText: {
type: Boolean,
default: false
},
author: {
type: Object,
default: null
@ -69,7 +73,7 @@ export default Vue.component('misskey-flavored-markdown', {
if (this.ast == null) {
// Parse text to ast
ast = parse(this.text);
ast = parse(this.text, this.plainText);
} else {
ast = this.ast as Node[];
}
@ -254,7 +258,8 @@ export default Vue.component('misskey-flavored-markdown', {
name: token.props.name
},
props: {
customEmojis: this.customEmojis || customEmojis
customEmojis: this.customEmojis || customEmojis,
normal: this.plainText
}
})];
}