mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 17:36:38 +02:00
Code Issues Releases Wiki Activity

Trigger autocomplete when : follows a newline too

Browse Source
This commit is contained in:
Toby Zerner
2016-02-22 21:51:24 +10:30
parent 6e414568db
commit 88bbd8ef3b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/emoji/js/forum/dist/extension.js vendored
View File

@@ -186,8 +186,8 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru
// check what user typed, emoji names only contains alphanumeric, // check what user typed, emoji names only contains alphanumeric,
// underline, '+' and '-' // underline, '+' and '-'
if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break; if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
// make sure ':' followed by a whitespace // make sure ':' followed by a whitespace or newline
if (character === ':' && (i == 0 || value.substr(i - 1, 1) === ' ')) { if (character === ':' && (i == 0 || /\s/.test(value.substr(i - 1, 1)))) {
emojiStart = i + 1; emojiStart = i + 1;
break; break;
} }

4
extensions/emoji/js/forum/src/addComposerAutocomplete.js
View File

@@ -54,8 +54,8 @@ export default function addComposerAutocomplete() {
// check what user typed, emoji names only contains alphanumeric, // check what user typed, emoji names only contains alphanumeric,
// underline, '+' and '-' // underline, '+' and '-'
if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break; if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
// make sure ':' followed by a whitespace // make sure ':' followed by a whitespace or newline
if (character === ':' && (i == 0 || value.substr(i-1, 1) === ' ')) { if (character === ':' && (i == 0 || /\s/.test(value.substr(i - 1, 1)))) {
emojiStart = i + 1; emojiStart = i + 1;
break; break;
} }