Merge pull request #3786 from sashkab/emoji-fix

Show emoji popup if colon preceding by space or is new line.
2013-04-30 08:21:21 -07:00 · 2013-04-30 08:21:21 -07:00 · 00ed1e9088
parent 3f46287842 26d0e47ce4
commit 00ed1e9088
1 changed files with 1 additions and 1 deletions
--- 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