Download as
Browse Code »

Commit 5e985a7eed7317d4f0ed323c4f6f7d0f386fbde4

Authored by Marin Jankovski
1 parent a87f0376
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use emoji assets on autocomplete.

Showing 3 changed files with 2 additions and 4 deletions   Show diff stats
app/assets/javascripts/gfm_auto_complete.js.coffee
  Diff comments   View file @5e985a7
... ... @@ -6,7 +6,6 @@ GitLab.GfmAutoComplete =
6 6 dataSource: ''
7 7 # Emoji
8 8 Emoji:
9   - assetBase: ''
10 9 template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>'
11 10  
12 11 # Team Members
... ... @@ -27,7 +26,7 @@ GitLab.GfmAutoComplete =
27 26 tpl: @Emoji.template
28 27 callbacks:
29 28 before_save: (emojis) =>
30   - $.map emojis, (em) => name: em, insert: em+ ':', image: "#{@Emoji.assetBase}/#{em}.png"
  29 + $.map emojis, (em) => name: em.name, insert: em.name+ ':', image: em.path
31 30  
32 31 # Team Members
33 32 input.atwho
... ...
app/controllers/projects_controller.rb
  Diff comments   View file @5e985a7
... ... @@ -124,7 +124,7 @@ class ProjectsController &lt; ApplicationController
124 124  
125 125 def autocomplete_sources
126 126 @suggestions = {
127   - emojis: Emoji.names,
  127 + emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } },
128 128 issues: @project.issues.select([:iid, :title, :description]),
129 129 mergerequests: @project.merge_requests.select([:iid, :title, :description]),
130 130 members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
... ...
app/views/layouts/_init_auto_complete.html.haml
  Diff comments   View file @5e985a7
1 1 :javascript
2 2 GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}"
3   - GitLab.GfmAutoComplete.Emoji.assetBase = "#{Gitlab.config.gitlab.relative_url_root + Emoji.asset_path}"
4 3 GitLab.GfmAutoComplete.setup();
... ...