diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-20 11:47:35 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-20 11:47:35 +0100 |
| commit | 1a7ccd0f0aacb33be3d8d3456bdedd8f08b7cc96 (patch) | |
| tree | d4ec5ff09b73a341d3bfd4a9f5a01d8bb84a9dde /app/assets/javascripts | |
| parent | 5cefd8ab7655ec6433b3048a7382720c5300dc4c (diff) | |
| download | gitlab-ce-1a7ccd0f0aacb33be3d8d3456bdedd8f08b7cc96.tar.gz | |
Removed animation from labels filter
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/issues.js.coffee | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee index f26b4f723eb..8719d22a5bb 100644 --- a/app/assets/javascripts/issues.js.coffee +++ b/app/assets/javascripts/issues.js.coffee @@ -29,11 +29,9 @@ toggleLabelFilters: ()-> $filteredLabels = $('.filtered-labels') if $filteredLabels.find('.label-row').length > 0 - #$filteredLabels.show() - $filteredLabels.slideDown().css({'overflow':'visible'}) + $filteredLabels.removeClass('hidden') else - #$filteredLabels.hide() - $filteredLabels.slideUp().css({'overflow':'visible'}) + $filteredLabels.addClass('hidden') reload: -> Issues.initChecks() @@ -96,25 +94,11 @@ Issues.reload() Issues.updateStateFilters() $filteredLabels = $('.filtered-labels') - $filteredLabelsSpans = $filteredLabels.find('.label-row') - gl.animate.animateEach( - $filteredLabelsSpans, 'fadeOutDown', 20, - cssStart: - opacity: 1 - 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 - ) + + if typeof Issue.labelRow is 'function' + $filteredLabels.html(Issue.labelRow(data)) + + Issues.toggleLabelFilters() dataType: "json" |