Commit 1a7ccd0f authored by Phil Hughes's avatar Phil Hughes

Removed animation from labels filter

parent 5cefd8ab
...@@ -29,11 +29,9 @@ ...@@ -29,11 +29,9 @@
toggleLabelFilters: ()-> toggleLabelFilters: ()->
$filteredLabels = $('.filtered-labels') $filteredLabels = $('.filtered-labels')
if $filteredLabels.find('.label-row').length > 0 if $filteredLabels.find('.label-row').length > 0
#$filteredLabels.show() $filteredLabels.removeClass('hidden')
$filteredLabels.slideDown().css({'overflow':'visible'})
else else
#$filteredLabels.hide() $filteredLabels.addClass('hidden')
$filteredLabels.slideUp().css({'overflow':'visible'})
reload: -> reload: ->
Issues.initChecks() Issues.initChecks()
...@@ -96,25 +94,11 @@ ...@@ -96,25 +94,11 @@
Issues.reload() Issues.reload()
Issues.updateStateFilters() Issues.updateStateFilters()
$filteredLabels = $('.filtered-labels') $filteredLabels = $('.filtered-labels')
$filteredLabelsSpans = $filteredLabels.find('.label-row')
gl.animate.animateEach( if typeof Issue.labelRow is 'function'
$filteredLabelsSpans, 'fadeOutDown', 20, $filteredLabels.html(Issue.labelRow(data))
cssStart:
opacity: 1 Issues.toggleLabelFilters()
cssEnd:
opacity: 0
).then( ->
if typeof Issue.labelRow is 'function'
$filteredLabels.html(Issue.labelRow(data))
Issues.toggleLabelFilters()
$spans = $filteredLabels.find('.label-row')
$spans.css('opacity', 0)
return gl.animate.animateEach $spans, 'fadeInUp', 20,
cssStart:
opacity: 0
cssEnd:
opacity: 1
)
dataType: "json" dataType: "json"
......
- labels.each do |label| - labels.each do |label|
%span.label-row %span.label-row
= link_to_label(label, tooltip: false) = link_to_label(label, tooltip: false)
\ No newline at end of file
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.filter-item.inline .filter-item.inline
= button_tag "Update issues", class: "btn update_selected_issues btn-save" = button_tag "Update issues", class: "btn update_selected_issues btn-save"
.gray-content-block.second-block.filtered-labels .gray-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels) }
- if @labels - if @labels
= render "shared/labels_row", labels: @labels = render "shared/labels_row", labels: @labels
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment