diff options
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
-rw-r--r-- | app/assets/javascripts/labels_select.js | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 56e69ab9418..fb88e48c9a6 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -1,4 +1,4 @@ -/* eslint-disable no-useless-return, func-names, no-underscore-dangle, no-new, consistent-return, no-shadow, no-param-reassign, no-lonely-if, dot-notation, no-empty */ +/* eslint-disable func-names, no-underscore-dangle, no-new, consistent-return, no-shadow, no-param-reassign, no-lonely-if, no-empty */ /* global Issuable */ /* global ListLabel */ @@ -7,7 +7,6 @@ import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { isScopedLabel } from '~/lib/utils/common_utils'; import boardsStore from './boards/stores/boards_store'; -import ModalStore from './boards/stores/modal_store'; import CreateLabelDropdown from './create_label'; import { deprecatedCreateFlash as flash } from './flash'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; @@ -313,7 +312,11 @@ export default class LabelsSelect { return; } - if ($('html').hasClass('issue-boards-page')) { + if ( + $('html') + .attr('class') + .match(/issue-boards-page|epic-boards-page/) + ) { return; } if ($dropdown.hasClass('js-multiselect')) { @@ -357,21 +360,7 @@ export default class LabelsSelect { return; } - let boardsModel; - if ($dropdown.closest('.add-issues-modal').length) { - boardsModel = ModalStore.store.filter; - } - - if (boardsModel) { - if (label.isAny) { - boardsModel['label_name'] = []; - } else if ($el.hasClass('is-active')) { - boardsModel['label_name'].push(label.title); - } - - e.preventDefault(); - return; - } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { + if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { if (!$dropdown.hasClass('js-multiselect')) { selectedLabel = label.title; return Issuable.filterResults($dropdown.closest('form')); @@ -522,11 +511,15 @@ export default class LabelsSelect { } bindEvents() { - return $('body').on('change', '.selected-issuable', this.onSelectCheckboxIssue); + return $('body').on( + 'change', + '.issuable-list input[type="checkbox"]', + this.onSelectCheckboxIssue, + ); } // eslint-disable-next-line class-methods-use-this onSelectCheckboxIssue() { - if ($('.selected-issuable:checked').length) { + if ($('.issuable-list input[type="checkbox"]:checked').length) { return; } return $('.issues-bulk-update .labels-filter .dropdown-toggle-text').text(__('Label')); |