Merge branch 'members-ee-code-ce' into 'master'

CE backport of members-ee-code

See merge request gitlab-org/gitlab-ce!25593

app/assets/javascripts/members.js

@@ -16,25 +16,33 @@ export default class Members {
     gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change');
   }
 
+  dropdownClicked(options) {
+    this.formSubmit(null, options.$el);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  dropdownToggleLabel(selected, $el) {
+    return $el.text();
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  dropdownIsSelectable(selected, $el) {
+    return !$el.hasClass('is-active');
+  }
+
   initGLDropdown() {
     $('.js-member-permissions-dropdown').each((i, btn) => {
       const $btn = $(btn);
 
       $btn.glDropdown({
         selectable: true,
-        isSelectable(selected, $el) {
-          return !$el.hasClass('is-active');
-        },
+        isSelectable: (selected, $el) => this.dropdownIsSelectable(selected, $el),
         fieldName: $btn.data('fieldName'),
         id(selected, $el) {
           return $el.data('id');
         },
-        toggleLabel(selected, $el) {
-          return $el.text();
-        },
-        clicked: options => {
-          this.formSubmit(null, options.$el);
-        },
+        toggleLabel: (selected, $el) => this.dropdownToggleLabel(selected, $el, $btn),
+        clicked: options => this.dropdownClicked(options),
       });
     });
   }
@@ -55,6 +63,7 @@ export default class Members {
     $toggle.enable();
     $dateInput.enable();
   }
+
   // eslint-disable-next-line class-methods-use-this
   getMemberListItems($el) {
     const $memberListItem = $el.is('.member') ? $el : $(`#${$el.data('elId')}`);

app/assets/javascripts/pages/groups/group_members/index/index.js

 /* eslint-disable no-new */
 
 import memberExpirationDate from '~/member_expiration_date';
-import Members from '~/members';
+import Members from 'ee_else_ce/members';
 import UsersSelect from '~/users_select';
 
 document.addEventListener('DOMContentLoaded', () => {

app/assets/javascripts/pages/projects/project_members/index.js

+import Members from 'ee_else_ce/members';
 import memberExpirationDate from '../../../member_expiration_date';
 import UsersSelect from '../../../users_select';
 import groupsSelect from '../../../groups_select';
-import Members from '../../../members';
 
 document.addEventListener('DOMContentLoaded', () => {
   memberExpirationDate('.js-access-expiration-date-groups');