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:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-09 07:09:09 +0300
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-13 23:10:49 +0300
commit42e0625dfb2a791affd592df1f879083702e6f86 (patch)
tree328494558d9c9b6a38d576534ed94164f2778a31 /app/assets/javascripts/labels_select.js.coffee
parent1617d1e0267f389e040772bfed0dd29e34b25c06 (diff)
Filter by multiple labels with little animation.
Diffstat (limited to 'app/assets/javascripts/labels_select.js.coffee')
-rw-r--r--app/assets/javascripts/labels_select.js.coffee9
1 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 9cebc26e668..97a813577ed 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -16,6 +16,7 @@ class @LabelsSelect
abilityName = $dropdown.data('ability-name')
$selectbox = $dropdown.closest('.selectbox')
$block = $selectbox.closest('.block')
+ $form = $dropdown.closest('form')
$sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon span')
$value = $block.find('.value')
$loading = $block.find('.block-loading').fadeOut()
@@ -171,7 +172,7 @@ class @LabelsSelect
.find('a')
.each((i) ->
setTimeout(=>
- glAnimate($(@), 'pulse')
+ gl.animate.animate($(@), 'pulse')
,200 * i
)
)
@@ -201,9 +202,9 @@ class @LabelsSelect
renderRow: (label) ->
selectedClass = ''
- if $selectbox.find("input[type='hidden']\
+ if $form.find("input[type='hidden']\
[name='#{$dropdown.data('field-name')}']\
- [value='#{label.id}']").length
+ [value='#{this.id(label)}']").length
selectedClass = 'is-active'
color = if label.color? then "<span class='dropdown-label-box' style='background-color: #{label.color}'></span>" else ""
@@ -248,8 +249,6 @@ class @LabelsSelect
.find("input[type='hidden'][name='#{$dropdown.data('field-name')}']")
Issues.filterResults(
$dropdown.closest('form'),
- selectedLabels,
- $dropdown.data('singularFieldName'),
$dropdown.data('fieldName')
)
else if $dropdown.hasClass('js-filter-submit')