Permalink
Browse files

Refactor GFM JS naming and access

  • Loading branch information...
1 parent 1cda624 commit 3e800c3bb1b835cd17e32eedd8816bc17f6317e4 @riyad riyad committed Nov 21, 2012
@@ -1,51 +1,52 @@
# Creates the variables for setting up GFM auto-completion
window.GitLab ?= {}
-window.GitLab.AutoComplete ?= {}
+GitLab.GfmAutoComplete ?= {}
# Emoji
data = []
template = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>"
-window.GitLab.AutoComplete.Emoji = {data, template}
+GitLab.GfmAutoComplete.Emoji = {data, template}
# Team Members
+data = []
url = '';
params = {private_token: '', page: 1}
-window.GitLab.AutoComplete.Members = {data, url, params}
+GitLab.GfmAutoComplete.Members = {data, url, params}
# Add GFM auto-completion to all input fields, that accept GFM input.
-window.setupGfmAutoComplete = ->
+GitLab.GfmAutoComplete.setup = ->
input = $('.js-gfm-input')
# Emoji
input.atWho ':',
- data: GitLab.AutoComplete.Emoji.data,
- tpl: GitLab.AutoComplete.Emoji.template
+ data: GitLab.GfmAutoComplete.Emoji.data,
+ tpl: GitLab.GfmAutoComplete.Emoji.template
# Team Members
input.atWho '@', (query, callback) ->
(getMoreMembers = ->
- $.getJSON(GitLab.AutoComplete.Members.url, GitLab.AutoComplete.Members.params)
+ $.getJSON(GitLab.GfmAutoComplete.Members.url, GitLab.GfmAutoComplete.Members.params)
.success (members) ->
# pick the data we need
newMembersData = $.map(members, (m) -> m.name )
# add the new page of data to the rest
- $.merge(GitLab.AutoComplete.Members.data, newMembersData)
+ $.merge(GitLab.GfmAutoComplete.Members.data, newMembersData)
# show the pop-up with a copy of the current data
- callback(GitLab.AutoComplete.Members.data[..])
+ callback(GitLab.GfmAutoComplete.Members.data[..])
# are we past the last page?
if newMembersData.length is 0
# set static data and stop callbacks
input.atWho '@',
- data: GitLab.AutoComplete.Members.data
+ data: GitLab.GfmAutoComplete.Members.data
callback: null
else
# get next page
getMoreMembers()
# so the next request gets the next page
- GitLab.AutoComplete.Members.params.page += 1
+ GitLab.GfmAutoComplete.Members.params.page += 1
).call()
@@ -5,7 +5,7 @@ function switchToNewIssue(){
$("#new_issue_dialog").show("fade", { direction: "right" }, 150);
$('.top-tabs .add_new').hide();
disableButtonIfEmptyField("#issue_title", ".save-btn");
- setupGfmAutoComplete();
+ GitLab.GfmAutoComplete.setup();
});
}
@@ -16,7 +16,7 @@ function switchToEditIssue(){
$("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
$('.add_new').hide();
disableButtonIfEmptyField("#issue_title", ".save-btn");
- setupGfmAutoComplete();
+ GitLab.GfmAutoComplete.setup();
});
}
@@ -1,17 +1,17 @@
: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+':',
image: '#{image_path("emoji")}/'+value+'.png'
}
});
- setupGfmAutoComplete();
+ GitLab.GfmAutoComplete.setup();
});
@@ -10,5 +10,5 @@
- else
:plain
$(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}");
- setupGfmAutoComplete();
+ GitLab.GfmAutoComplete.setup();

1 comment on commit 3e800c3

Owner

randx commented on 3e800c3 Nov 21, 2012

👍

Please sign in to comment.