diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-22 15:09:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-22 15:09:42 +0300 |
commit | 2c171fdd723a6a1f45dedd12e62f93745318b40e (patch) | |
tree | 989875e5b72e03be69aa3fb329900506a198b3f4 /app/assets/javascripts/labels_select.js | |
parent | c70359a07f62d06825c58e165e08874a21622cdc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
-rw-r--r-- | app/assets/javascripts/labels_select.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 63c4ad3c410..605cc4117a3 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -3,7 +3,7 @@ /* global ListLabel */ import $ from 'jquery'; -import { difference, isEqual, escape, sortBy, template } from 'lodash'; +import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; import { sprintf, s__, __ } from './locale'; import axios from './lib/utils/axios_utils'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; @@ -560,15 +560,15 @@ export default class LabelsSelect { IssuableBulkUpdateActions.willUpdateLabels = true; } // eslint-disable-next-line class-methods-use-this - setDropdownData($dropdown, isChecking, labelId) { + setDropdownData($dropdown, isMarking, labelId) { let userCheckedIds = $dropdown.data('user-checked') || []; let userUncheckedIds = $dropdown.data('user-unchecked') || []; - if (isChecking) { - userCheckedIds = userCheckedIds.concat(labelId); + if (isMarking) { + userCheckedIds = union(userCheckedIds, [labelId]); userUncheckedIds = difference(userUncheckedIds, [labelId]); } else { - userUncheckedIds = userUncheckedIds.concat(labelId); + userUncheckedIds = union(userUncheckedIds, [labelId]); userCheckedIds = difference(userCheckedIds, [labelId]); } |