summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/users_select.js
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-05-04 18:30:26 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-05-04 18:30:26 -0500
commit646f5a0c58876792b0f82422f7827af5bc546fe5 (patch)
tree91f0e022b11f67167b861e928f23827acc21946a /app/assets/javascripts/users_select.js
parent968cf644438d0e41c040c501ca67bf9a494c1a31 (diff)
downloadgitlab-ce-ch-test.tar.gz
test cich-test
Diffstat (limited to 'app/assets/javascripts/users_select.js')
-rw-r--r--app/assets/javascripts/users_select.js36
1 files changed, 21 insertions, 15 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index 2dcaa24e93a..fa66033d23e 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -84,6 +84,24 @@ import eventHub from './sidebar/event_hub';
$block[0].addEventListener('assignYourself', assignYourself);
}
+ const checkMaxSelect = function() {
+ const maxSelect = $dropdown.data('max-select');
+ if (maxSelect) {
+ const selected = getSelected();
+
+ if (selected.length > maxSelect) {
+ const firstSelectedId = selected[0];
+ const firstSelected = $dropdown.closest('.selectbox')
+ .find(`input[name='${$dropdown.data('field-name')}'][value=${firstSelectedId}]`);
+
+ firstSelected.remove();
+ eventHub.$emit('sidebar.removeAssignee', {
+ id: firstSelectedId,
+ });
+ }
+ }
+ };
+
const getSelectedUserInputs = function() {
return $selectbox
.find(`input[name="${$dropdown.data('field-name')}"]`);
@@ -125,6 +143,7 @@ import eventHub from './sidebar/event_hub';
if ($dropdown.data('multiSelect')) {
assignYourself();
+ checkMaxSelect();
const currentUserInfo = $dropdown.data('currentUserInfo');
$dropdown.find('.dropdown-toggle-text').text(getMultiSelectDropdownTitle(currentUserInfo)).removeClass('is-default');
@@ -323,6 +342,7 @@ import eventHub from './sidebar/event_hub';
multiSelect: $dropdown.hasClass('js-multiselect'),
inputMeta: $dropdown.data('input-meta'),
clicked: function(options) {
+ debugger
const { $el, e, isMarking } = options;
const user = options.selectedObj;
@@ -333,21 +353,7 @@ import eventHub from './sidebar/event_hub';
// Enables support for limiting the number of users selected
// Automatically removes the first on the list if more users are selected
- const maxSelect = $dropdown.data('max-select');
- if (maxSelect) {
- const selected = getSelected();
-
- if (selected.length > maxSelect) {
- const firstSelectedId = selected[0];
- const firstSelected = $dropdown.closest('.selectbox')
- .find(`input[name='${$dropdown.data('field-name')}'][value=${firstSelectedId}]`);
-
- firstSelected.remove();
- eventHub.$emit('sidebar.removeAssignee', {
- id: firstSelectedId,
- });
- }
- }
+ checkMaxSelect();
if (user.beforeDivider && user.name.toLowerCase() === 'unassigned') {
// Unassigned selected