kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Allow to pass non-asynchronous data to GitLabDropdown

Browse source
This commit is contained in:
Alfredo Sumaran 2016-03-11 13:18:38 -05:00 committed by Jacob Schatz
parent dccda7d09f
commit a0c1aa6d04
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/assets/javascripts/gl_dropdown.js.coffee
View file

@ -83,15 +83,19 @@ class GitLabDropdown
search_fields = if @options.search then @options.search.fields else []; search_fields = if @options.search then @options.search.fields else [];
if @options.data if @options.data
# Remote data # If data is an array
@remote = new GitLabDropdownRemote @options.data, { if _.isArray @options.data
dataType: @options.dataType, @parseData @options.data
beforeSend: @toggleLoading.bind(@) else
success: (data) => # Remote data
@fullData = data @remote = new GitLabDropdownRemote @options.data, {
dataType: @options.dataType,
beforeSend: @toggleLoading.bind(@)
success: (data) =>
@fullData = data
@parseData @fullData @parseData @fullData
} }
# Init filiterable # Init filiterable
if @options.filterable if @options.filterable
@ -204,7 +208,12 @@ class GitLabDropdown
else else
selected = if @options.isSelected then @options.isSelected(data) else false selected = if @options.isSelected then @options.isSelected(data) else false
url = if @options.url then @options.url(data) else "#" url = if @options.url then @options.url(data) else "#"
text = if @options.text then @options.text(data) else ""
if @options.text?
text = @options.text(data)
else
text = data.text if data.text?
cssClass = ""; cssClass = "";
if selected if selected