diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-29 12:49:19 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-29 10:49:55 -0400 |
| commit | c83db6b7cb8fce7262e0030c1eec6ee9382888f3 (patch) | |
| tree | 8e4eb1308d476dfc4d1ae6baf2f9142e43ccca0c | |
| parent | 2bb054c461043bf4770e6691f4142526ed03491b (diff) | |
| download | gitlab-ce-c83db6b7cb8fce7262e0030c1eec6ee9382888f3.tar.gz | |
Merge branch 'filter-fade-fix' into 'master'
Removed fade when filtering results
## What does this MR do?
Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required.
Best way to see issue - filter issues & then go back. Will still have opacity styling.
See merge request !4932
(cherry picked from commit bef4294c58e0bbadc01f633fc8bea514801de7ae)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/issuable.js.coffee | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2ea3f96e760..a680d6fc123 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.9.3 - Use clock_gettime for all performance timestamps. !4899 - Use memorized tags array when searching tags by name. !4859 - Fixed avatar alignment in new MR view. !4901 + - Removed fade when filtering results. !4932 v 8.9.2 - Fix visibility of snippets when searching. diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee index 6a108c033ea..0527c66461c 100644 --- a/app/assets/javascripts/issuable.js.coffee +++ b/app/assets/javascripts/issuable.js.coffee @@ -59,13 +59,12 @@ issuable_created = false filterResults: (form) => formData = form.serialize() - $('.issues-holder, .merge-requests-holder').css('opacity', '0.5') formAction = form.attr('action') issuesUrl = formAction issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}") issuesUrl += formData - Turbolinks.visit(issuesUrl); + Turbolinks.visit(issuesUrl) initChecks: -> @issuableBulkActions = $('.bulk-update').data('bulkActions') |