From 15a87c55ebb733a801775afd5c770fc7471fd9eb Mon Sep 17 00:00:00 2001
From: Sajjad Hasehmian <wolaws@gmail.com>
Date: Fri, 12 Feb 2016 20:04:37 +0330
Subject: [PATCH] improve emoji popup

---
 extensions/emoji/js/forum/dist/extension.js              | 4 ++--
 extensions/emoji/js/forum/src/addComposerAutocomplete.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/emoji/js/forum/dist/extension.js b/extensions/emoji/js/forum/dist/extension.js
index 8308f9f0f..de0045cbb 100644
--- a/extensions/emoji/js/forum/dist/extension.js
+++ b/extensions/emoji/js/forum/dist/extension.js
@@ -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;
           }
diff --git a/extensions/emoji/js/forum/src/addComposerAutocomplete.js b/extensions/emoji/js/forum/src/addComposerAutocomplete.js
index ff0bc3379..b878b3806 100644
--- a/extensions/emoji/js/forum/src/addComposerAutocomplete.js
+++ b/extensions/emoji/js/forum/src/addComposerAutocomplete.js
@@ -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;
           }