deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor GFM JS naming and access

Browse source
This commit is contained in:
Riyad Preukschas 2012-11-21 20:23:19 +01:00
parent 1cda62465f
commit 3e800c3bb1
4 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/layouts/_init_auto_complete.html.haml
View file

@ -1,11 +1,11 @@
:javascript
$(function() {
GitLab.AutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.code}/members" if @project }";
GitLab.AutoComplete.Members.params.private_token = "#{current_user.private_token}";
GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.code}/members" if @project }";
GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";
GitLab.AutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
// convert the list so that the items have the right format for completion
GitLab.AutoComplete.Emoji.data = $.map(GitLab.AutoComplete.Emoji.data, function(value) {
GitLab.GfmAutoComplete.Emoji.data = $.map(GitLab.GfmAutoComplete.Emoji.data, function(value) {
return {
name: value,
insert: value+':',
@ -13,5 +13,5 @@
}
});
setupGfmAutoComplete();
GitLab.GfmAutoComplete.setup();
});

2
app/views/notes/_create_common_note.js.haml
View file

@ -10,5 +10,5 @@
- else
:plain
$(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}");
setupGfmAutoComplete();
GitLab.GfmAutoComplete.setup();