summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-19 15:05:39 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-19 15:05:39 +0900
commit7a270275efcb49c182db5db73ce10c65ba6ad3ff (patch)
tree4eb87d011ec38b23ed123d713b6640cc4ac9e2ea /src/client/app/common
parentAdd doc (diff)
downloadmisskey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.tar.gz
misskey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.tar.bz2
misskey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.zip
Add new text syntax
And some fixes
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/views/components/note-html.ts13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/note-html.ts b/src/client/app/common/views/components/note-html.ts
index 24e750a671..38f6251cf7 100644
--- a/src/client/app/common/views/components/note-html.ts
+++ b/src/client/app/common/views/components/note-html.ts
@@ -97,7 +97,9 @@ export default Vue.component('mk-note-html', {
}, token.content);
case 'code':
- return createElement('pre', [
+ return createElement('pre', {
+ class: 'code'
+ }, [
createElement('code', {
domProps: {
innerHTML: token.html
@@ -132,6 +134,13 @@ export default Vue.component('mk-note-html', {
}, text2.replace(/\n/g, ' '));
}
+ case 'title':
+ return createElement('div', {
+ attrs: {
+ class: 'title'
+ }
+ }, token.title);
+
case 'emoji':
const emoji = emojilib.lib[token.emoji];
return createElement('span', emoji ? emoji.char : token.content);
@@ -144,7 +153,7 @@ export default Vue.component('mk-note-html', {
const _els = [];
els.forEach((el, i) => {
if (el.tag == 'br') {
- if (els[i - 1].tag != 'div') {
+ if (!['div', 'pre'].includes(els[i - 1].tag)) {
_els.push(el);
}
} else {