summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-20 14:55:58 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-20 14:55:58 +0000
commit1e420ccf59eae2015cda1a5d6236f22fc33db70c (patch)
treeb16a2c994a17c9de02cb02cdebca0ef2370eb32f
parent01fe50a72513a88f2168c8c0a649661b1382a42b (diff)
parentc5d026a0d3a0389716ed8b73ffe0081a3c1d3899 (diff)
downloadgitlab-ce-1e420ccf59eae2015cda1a5d6236f22fc33db70c.tar.gz
Merge branch 'dropdown-persits-filtered-data' into 'master'
Fixed issue with filtered data persisting when dropdown closed ![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif) Closes #14401 See merge request !3302
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index c81e8bf760a..960585245d7 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -167,7 +167,11 @@ class GitLabDropdown
hidden: =>
if @options.filterable
- @dropdown.find(".dropdown-input-field").blur().val("")
+ @dropdown
+ .find(".dropdown-input-field")
+ .blur()
+ .val("")
+ .trigger("keyup")
if @dropdown.find(".dropdown-toggle-page").length
$('.dropdown-menu', @dropdown).removeClass PAGE_TWO_CLASS