summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2018-09-01 22:32:51 +0900
committerAya Morisawa <AyaMorisawa4869@gmail.com>2018-09-01 22:38:50 +0900
commitacffc3e522c4fd46d2206dc90546268f388a70b7 (patch)
treecb7e75ecea365bf858804c64cd822ab18ae4fcf1 /src
parentMerge pull request #2572 from syuilo/refactor-reversi-game (diff)
downloadsharkey-acffc3e522c4fd46d2206dc90546268f388a70b7.tar.gz
sharkey-acffc3e522c4fd46d2206dc90546268f388a70b7.tar.bz2
sharkey-acffc3e522c4fd46d2206dc90546268f388a70b7.zip
Refactor mfm component
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/misskey-flavored-markdown.ts13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts
index e97da4302c..44680751f7 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -205,17 +205,8 @@ export default Vue.component('misskey-flavored-markdown', {
}
}));
- const _els = [];
- els.forEach((el, i) => {
- if (el.tag == 'br') {
- if (!['div', 'pre'].includes(els[i - 1].tag)) {
- _els.push(el);
- }
- } else {
- _els.push(el);
- }
- });
-
+ // el.tag === 'br' のとき i !== 0 が保証されるため、短絡評価により els[i - 1] は配列外参照しない
+ const _els = els.filter((el, i) => !(el.tag === 'br' && ['div', 'pre'].includes(els[i - 1].tag)));
return createElement('span', _els);
}
});