diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-30 20:06:07 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-30 20:06:07 +0000 |
| commit | 3995baad6aeabfaba1ae5e9f867ed66ce3e6038a (patch) | |
| tree | ae67b922b3558ba63f61b32d405728c3700c4325 /app/assets/javascripts/gl_dropdown.js | |
| parent | 9e90edb3729b341c7ebe7d1c77063db0e1f8f19f (diff) | |
| parent | 2c521dd245f73f64deef952f98f5ced32c53e89f (diff) | |
| download | gitlab-ce-3995baad6aeabfaba1ae5e9f867ed66ce3e6038a.tar.gz | |
Merge branch 'issue-sidebar-empty-assignee' into 'master'
Resets issue boards assignee dropdown
Closes #26514 and #26814
See merge request !8540
Diffstat (limited to 'app/assets/javascripts/gl_dropdown.js')
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index cc1c0877cdf..d2f66cf5249 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -512,12 +512,17 @@ // Append the menu into the dropdown GitLabDropdown.prototype.appendMenu = function(html) { + return this.clearMenu().append(html); + }; + + GitLabDropdown.prototype.clearMenu = function() { var selector; selector = '.dropdown-content'; if (this.dropdown.find(".dropdown-toggle-page").length) { selector = ".dropdown-page-one .dropdown-content"; } - return $(selector, this.dropdown).empty().append(html); + + return $(selector, this.dropdown).empty(); }; GitLabDropdown.prototype.renderItem = function(data, group, index) { |