diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-25 19:54:41 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-25 19:54:41 +0000 |
| commit | 7ce79f31670f3beaf5b29b06144a34e32b7cc4ec (patch) | |
| tree | ceacd7cc3b3a66a67d45f9d4f67ad528db808929 /app/assets/javascripts/labels_select.js | |
| parent | 94715834cef03ab5e7bda0bb558a650f39d41e94 (diff) | |
| parent | 2c45a73c8e0b07aec0d688a75beb54ebfd08ac07 (diff) | |
| download | gitlab-ce-7ce79f31670f3beaf5b29b06144a34e32b7cc4ec.tar.gz | |
Merge branch 'label-select-toggle' into 'master'
kamil-test-branch
Fixed label select toggle not updating correctly
Closes #26119
See merge request !8601
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index fd1e229e30a..70dc0d06b7b 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -336,7 +336,11 @@ .removeClass('is-active'); } - if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) { + if ($dropdown.hasClass('js-issuable-form-dropdown')) { + return; + } + + if ($dropdown.hasClass('js-filter-bulk-update')) { _this.enableBulkLabelDropdown(); _this.setDropdownData($dropdown, isMarking, this.id(label)); return; |