summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-16 16:56:53 -0500
committerPhil Hughes <me@iamphill.com>2017-01-16 16:56:53 -0500
commit2c45a73c8e0b07aec0d688a75beb54ebfd08ac07 (patch)
treeb73ab29c22c5e8299435a083a22188210c24cc64 /app
parent79373bdc5c025f189f3f17162945765a2617e820 (diff)
downloadgitlab-ce-label-select-toggle.tar.gz
Fixed label select toggle not updating correctlylabel-select-toggle
Closes #26119
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/labels_select.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index ec2fc87bece..4dbc82a73c4 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;