diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-10-24 16:48:41 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-31 12:58:35 +0100 |
| commit | b04b3d1de783ea70ca81c5f80c86d656ee6d82ea (patch) | |
| tree | 10bfe64f496eee2fdd7fdddf1b277ea4c4bf6b97 /app/assets/javascripts/users_select.js | |
| parent | 18db15244813c4ff1286e1297c9da42798b61b99 (diff) | |
| download | gitlab-ce-b04b3d1de783ea70ca81c5f80c86d656ee6d82ea.tar.gz | |
apply changes for JS and CSS from gitlab-ee!2912
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2912/
Diffstat (limited to 'app/assets/javascripts/users_select.js')
| -rw-r--r-- | app/assets/javascripts/users_select.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index a0883b32593..759cc9925f4 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -6,7 +6,7 @@ import _ from 'underscore'; // TODO: remove eventHub hack after code splitting refactor window.emitSidebarEvent = window.emitSidebarEvent || $.noop; -function UsersSelect(currentUser, els) { +function UsersSelect(currentUser, els, options = {}) { var $els; this.users = this.users.bind(this); this.user = this.user.bind(this); @@ -20,6 +20,8 @@ function UsersSelect(currentUser, els) { } } + const { handleClick } = options; + $els = $(els); if (!els) { @@ -442,6 +444,9 @@ function UsersSelect(currentUser, els) { } if ($el.closest('.add-issues-modal').length) { gl.issueBoards.ModalStore.store.filter[$dropdown.data('field-name')] = user.id; + } else if (handleClick) { + e.preventDefault(); + handleClick(user, isMarking); } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { return Issuable.filterResults($dropdown.closest('form')); } else if ($dropdown.hasClass('js-filter-submit')) { |