diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-11-07 14:16:49 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-11-07 14:16:49 +0000 |
commit | fdf635c03c2621fe36eba5691c1ab8b1a51f1081 (patch) | |
tree | 10a874c585982708e519e891482f7351d52c4cb5 /app/assets | |
parent | 8dc55ff35e4bfc46c9a5a9dd751648eb7ed73daf (diff) | |
download | gitlab-ce-fdf635c03c2621fe36eba5691c1ab8b1a51f1081.tar.gz |
Change fix, instead of hacking in a filter clear every time, fix the root cause by only selecting elements for that dropdown instance39564-clear-filter-on-gitlab-dropdown-open
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index bcfc9918315..4e7a6e54f90 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -331,7 +331,7 @@ GitLabDropdown = (function() { if (_this.dropdown.find('.dropdown-toggle-page').length) { selector = ".dropdown-page-one " + selector; } - return $(selector); + return $(selector, this.instance.dropdown); }; })(this), data: (function(_this) { @@ -543,8 +543,6 @@ GitLabDropdown = (function() { this.options.opened.call(this, e); } - if (this.options.filterable) this.filter.filter(); - return this.dropdown.trigger('shown.gl.dropdown'); }; |