diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-03-24 14:22:11 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-03-24 14:22:11 +0100 |
| commit | 5e985a7eed7317d4f0ed323c4f6f7d0f386fbde4 (patch) | |
| tree | 1de5e52b58a6b012d5cca8567aa8ffd2436dd126 /app/assets/javascripts/gfm_auto_complete.js.coffee | |
| parent | a87f03768f87c3ebe62b7aaf94380eb56239bd4e (diff) | |
| download | gitlab-ce-5e985a7eed7317d4f0ed323c4f6f7d0f386fbde4.tar.gz | |
Use emoji assets on autocomplete.
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js.coffee')
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index dd12000a1cf..00d56ae5b4b 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -6,7 +6,6 @@ GitLab.GfmAutoComplete = dataSource: '' # Emoji Emoji: - assetBase: '' template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>' # Team Members @@ -27,7 +26,7 @@ GitLab.GfmAutoComplete = tpl: @Emoji.template callbacks: before_save: (emojis) => - $.map emojis, (em) => name: em, insert: em+ ':', image: "#{@Emoji.assetBase}/#{em}.png" + $.map emojis, (em) => name: em.name, insert: em.name+ ':', image: em.path # Team Members input.atwho |