diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 14:55:58 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 12:29:25 +0100 |
commit | 726242c29dc31ccccc9989dc0b1dd2351fff0343 (patch) | |
tree | 5dafd428021133aa85242c2dd0fc29ef6eec1543 | |
parent | 2b07702ad596d62234a88266f671824d125733fa (diff) | |
download | gitlab-ce-726242c29dc31ccccc9989dc0b1dd2351fff0343.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.coffee | 6 |
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 |