misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

やった (#5110)

Browse source
This commit is contained in:
syuilo 2019-07-06 00:46:00 +09:00 • committed by GitHub
parent 3bc2fe8527
commit 5ae6b0058f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,11 +22,11 @@ export default Vue.component('misskey-flavored-markdown', {
type: String,
required: true
},
shouldBreak: {
plain: {
type: Boolean,
default: true
default: false
},
plainText: {
nowrap: {
type: Boolean,
default: false
},
@ -50,7 +50,7 @@ export default Vue.component('misskey-flavored-markdown', {
render(createElement) {
if (this.text == null || this.text == '') return;
const ast = (this.plainText ? parsePlain : parse)(this.text);
const ast = (this.plain ? parsePlain : parse)(this.text);
let bigCount = 0;
let motionCount = 0;
@ -60,7 +60,7 @@ export default Vue.component('misskey-flavored-markdown', {
case 'text': {
const text = token.node.props.text.replace(/(\r\n|\n|\r)/g, '\n');
if (this.shouldBreak) {
if (!this.plain) {
const x = text.split('\n')
.map(t => t == '' ? [createElement('br')] : [createElement('span', t), createElement('br')]);
x[x.length - 1].pop();
@ -270,7 +270,7 @@ export default Vue.component('misskey-flavored-markdown', {
},
props: {
customEmojis: this.customEmojis || customEmojis,
normal: this.plainText
normal: this.plain
}
})];
}