From: Aleks Bunin <b@enlnt.com>
Date: Tue, 30 Apr 2013 13:29:43 +0000 (-0400)
Subject: Show emoji popup if : preceeding by space or is new line.
X-Git-Tag: v5.2.0~120^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=26d0e47ce4ad1d26b07959bb4a39203301f35e4e;p=wvm%2Fgitlab.git

Show emoji popup if : preceeding by space or is new line.
---

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 1cc9d34dd..9ef194fbd 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -20,7 +20,7 @@ GitLab.GfmAutoComplete =
     input = $('.js-gfm-input')
 
     # Emoji
-    input.atWho ':',
+    input.atWho '(?:^|\\s):',
       data: @Emoji.data
       tpl: @Emoji.template