Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-15 21:20:22 +0300
committerPhil Hughes <me@iamphill.com>2016-03-18 14:40:16 +0300
commit882ebfc29661f4e78aabbb63230ef9ae08770a36 (patch)
treef2f7e097127ab9b68ae4d39e79b3fa501459f13c /app/assets/javascripts/milestone_select.js.coffee
parentbdbc9884348515f71530efc2759c05d794f8547e (diff)
Changing filter dropdowns shows loading
Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
Diffstat (limited to 'app/assets/javascripts/milestone_select.js.coffee')
-rw-r--r--app/assets/javascripts/milestone_select.js.coffee8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index 32159a7c179..f38c375c61a 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -7,6 +7,7 @@ class @MilestoneSelect
showNo = $(dropdown).data('show-no')
showAny = $(dropdown).data('show-any')
useId = $(dropdown).data('use-id')
+ defaultLabel = $(dropdown).text().trim()
$(dropdown).glDropdown(
data: (term, callback) ->
@@ -42,6 +43,11 @@ class @MilestoneSelect
search:
fields: ['title']
selectable: true
+ toggleLabel: (selected) ->
+ if selected && selected.id
+ selected.title
+ else
+ defaultLabel
fieldName: $(dropdown).data('field-name')
text: (milestone) ->
milestone.title
@@ -57,5 +63,5 @@ class @MilestoneSelect
milestone.title is selectedMilestone
clicked: ->
if $(dropdown).hasClass "js-filter-submit"
- $(dropdown).parents('form').submit()
+ Issues.filterResults $(dropdown).parents("form")
)