summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-31 17:42:36 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-31 17:42:36 +0900
commit4f99b98ed8f868dace816505e75cbb96e3fe2477 (patch)
treee1d0e2c58b674f86d94cc4c4e98316ddfb199da9 /src
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadsharkey-4f99b98ed8f868dace816505e75cbb96e3fe2477.tar.gz
sharkey-4f99b98ed8f868dace816505e75cbb96e3fe2477.tar.bz2
sharkey-4f99b98ed8f868dace816505e75cbb96e3fe2477.zip
Revert b515cc90e9070465d9ba1f2e40d7af184fff5491
Diffstat (limited to 'src')
-rw-r--r--src/mfm/language.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mfm/language.ts b/src/mfm/language.ts
index 75451f3bd4..8f35d443dc 100644
--- a/src/mfm/language.ts
+++ b/src/mfm/language.ts
@@ -108,20 +108,20 @@ export const mfmLanguage = P.createLanguage({
strike: r => P.regexp(/~~(.+?)~~/, 1).map(x => createTree('strike', r.inline.atLeast(1).tryParse(x), {})),
motion: r => {
const paren = P.regexp(/\(\(\(([\s\S]+?)\)\)\)/, 1);
- const xml = P.regexp(/<motion>(.+)<\/motion>/, 1);
+ const xml = P.regexp(/<motion>(.+?)<\/motion>/, 1);
return P.alt(paren, xml).map(x => createTree('motion', r.inline.atLeast(1).tryParse(x), {}));
},
spin: r => {
return P((input, i) => {
const text = input.substr(i);
- const match = text.match(/^<spin(\s[a-z]+?)?>(.+)<\/spin>/i);
+ const match = text.match(/^<spin(\s[a-z]+?)?>(.+?)<\/spin>/i);
if (!match) return P.makeFailure(i, 'not a spin');
return P.makeSuccess(i + match[0].length, {
content: match[2], attr: match[1] ? match[1].trim() : null
});
}).map(x => createTree('spin', r.inline.atLeast(1).tryParse(x.content), { attr: x.attr }));
},
- jump: r => P.regexp(/<jump>(.+)<\/jump>/, 1).map(x => createTree('jump', r.inline.atLeast(1).tryParse(x), {})),
+ jump: r => P.regexp(/<jump>(.+?)<\/jump>/, 1).map(x => createTree('jump', r.inline.atLeast(1).tryParse(x), {})),
flip: r => P.regexp(/<flip>(.+?)<\/flip>/, 1).map(x => createTree('flip', r.inline.atLeast(1).tryParse(x), {})),
center: r => r.startOfLine.then(P.regexp(/<center>([\s\S]+?)<\/center>/, 1).map(x => createTree('center', r.inline.atLeast(1).tryParse(x), {}))),
inlineCode: () => P.regexp(/`([^ยด\n]+?)`/, 1).map(x => createLeaf('inlineCode', { code: x })),