summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-10-31 00:30:23 +0100
committerGitHub2018-10-31 00:30:23 +0100
commitd79301a00da701571294a3bd89911ee8dfc77f26 (patch)
tree481155b09df6650cef59d14baeda20f1edf7a8d3 /public
parent279213eb75ddfe29a81be193e9a42f25979d9d06 (diff)
parent7e45533c75a3697c916e52e5f4ddff42a38bd3d5 (diff)
Merge pull request #1031 from SISheogorath/fix/emojiPlugin
Fix emoji regex
Diffstat (limited to 'public')
-rw-r--r--public/js/extra.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/js/extra.js b/public/js/extra.js
index ddec31a8..4db36ff6 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -1147,7 +1147,7 @@ const pdfPlugin = new Plugin(
const emojijsPlugin = new Plugin(
// regexp to match emoji shortcodes :something:
- /:([\d\D]*):/,
+ /:([^\s:]+):/,
(match, utils) => {
const emoji = match[1] ? match[1].toLowerCase() : undefined