Merge pull request #3786 from sashkab/emoji-fix

Show emoji popup if colon preceding by space or is new line.

Merge pull request #3786 from sashkab/emoji-fix
Show emoji popup if colon preceding by space or is new line.
00ed1e90 · Dmitriy Zaporozhets · 3f462878 · 26d0e47c · 00ed1e90
Commit 00ed1e90 authored Apr 30, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/gfm_auto_complete.js.coffee app/assets/javascripts/gfm_auto_complete.js.coffee +1 -1

No files found.
--- 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