improve emoji popup

This commit is contained in:
Sajjad Hasehmian 2016-02-12 20:04:37 +03:30
parent 50d88d4547
commit 15a87c55eb
2 changed files with 4 additions and 4 deletions

View File

@ -183,8 +183,8 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru
emojiStart = 0;
for (var i = cursor - 1; i >= 0; i--) {
var character = value.substr(i, 1);
if (/\s/.test(character)) break;
if (character === ':') {
if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
if (character === ':' && (i == 0 || value.substr(i - 1, 1) === ' ')) {
emojiStart = i + 1;
break;
}

View File

@ -51,8 +51,8 @@ export default function addComposerAutocomplete() {
emojiStart = 0;
for (let i = cursor - 1; i >= 0; i--) {
const character = value.substr(i, 1);
if (/\s/.test(character)) break;
if (character === ':') {
if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
if (character === ':' && (i == 0 || value.substr(i-1, 1) === ' ')) {
emojiStart = i + 1;
break;
}