diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-04-19 16:22:23 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-23 13:08:16 -0400 |
commit | 85bbb914767af2816d16bf4304c4917e8ec86ed6 (patch) | |
tree | 2638018dda8e3dc5ee1b2d41c8d7e19c635c8c9f /app | |
parent | d086e76c2f75d0c0215c61c168832292c7f35641 (diff) | |
download | gitlab-ce-85bbb914767af2816d16bf4304c4917e8ec86ed6.tar.gz |
Fix GfmAutoComplete for jquery-atwho 1.0rs-update-d3-atwho
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index 00d56ae5b4b..4eb3f3c03f3 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -2,19 +2,19 @@ window.GitLab ?= {} GitLab.GfmAutoComplete = - # private_token: '' dataSource: '' + # Emoji Emoji: - template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>' + template: '<li>${name} <img alt="${name}" height="20" src="${path}" width="20" /></li>' # Team Members Members: - template: '<li data-value="${username}">${username} <small>${name}</small></li>' + template: '<li>${username} <small>${name}</small></li>' # Issues and MergeRequests Issues: - template: '<li data-value="${id}"><small>${id}</small> ${title} </li>' + template: '<li><small>${id}</small> ${title}</li>' # Add GFM auto-completion to all input fields, that accept GFM input. setup: -> @@ -23,45 +23,46 @@ GitLab.GfmAutoComplete = # Emoji input.atwho at: ':' - tpl: @Emoji.template - callbacks: - before_save: (emojis) => - $.map emojis, (em) => name: em.name, insert: em.name+ ':', image: em.path + displayTpl: @Emoji.template + insertTpl: ':${name}:' # Team Members input.atwho at: '@' - tpl: @Members.template - search_key: 'search' + displayTpl: @Members.template + insertTpl: '${atwho-at}${username}' + searchKey: 'search' callbacks: - before_save: (members) => - $.map members, (m) => name: m.name, username: m.username, search: "#{m.username} #{m.name}" + beforeSave: (members) -> + $.map members, (m) -> name: m.name, username: m.username, search: "#{m.username} #{m.name}" input.atwho at: '#' alias: 'issues' - search_key: 'search' - tpl: @Issues.template + searchKey: 'search' + displayTpl: @Issues.template + insertTpl: '${atwho-at}${id}' callbacks: - before_save: (issues) -> + beforeSave: (issues) -> $.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}" input.atwho at: '!' alias: 'mergerequests' - search_key: 'search' - tpl: @Issues.template + searchKey: 'search' + displayTpl: @Issues.template + insertTpl: '${atwho-at}${id}' callbacks: - before_save: (merges) -> + beforeSave: (merges) -> $.map merges, (m) -> id: m.iid, title: sanitize(m.title), search: "#{m.iid} #{m.title}" - input.one "focus", => + input.one 'focus', => $.getJSON(@dataSource).done (data) -> # load members - input.atwho 'load', "@", data.members + input.atwho 'load', '@', data.members # load issues - input.atwho 'load', "issues", data.issues + input.atwho 'load', 'issues', data.issues # load merge requests - input.atwho 'load', "mergerequests", data.mergerequests + input.atwho 'load', 'mergerequests', data.mergerequests # load emojis - input.atwho 'load', ":", data.emojis + input.atwho 'load', ':', data.emojis |