Commit 877ddab2 authored by Phil Hughes's avatar Phil Hughes

Fixed bug with not updating times when changes

Enabled eslint
parent 403c91db
/* eslint-disable */ (() => {
((w) => { window.gl = window.gl || {};
w.gl = w.gl || {};
class Members { class Members {
constructor() { constructor() {
...@@ -26,27 +25,27 @@ ...@@ -26,27 +25,27 @@
gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change'); gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change');
} }
initGLDropdown () { initGLDropdown() {
$('.js-member-permissions-dropdown').each((i, btn) => { $('.js-member-permissions-dropdown').each((i, btn) => {
const $btn = $(btn); const $btn = $(btn);
$btn.glDropdown({ $btn.glDropdown({
selectable: true, selectable: true,
isSelectable (selected, $el) { isSelectable(selected, $el) {
const $link = $($el); const $link = $($el);
return $link.data('revert') ? false : true; return $link.data('revert');
}, },
fieldName: $btn.data('field-name'), fieldName: $btn.data('field-name'),
id (selected, $el) { id(selected, $el) {
return $el.data('id'); return $el.data('id');
}, },
toggleLabel (selected, $el) { toggleLabel(selected, $el) {
if ($el.data('revert')) { if ($el.data('revert')) {
return $btn.text(); return $btn.text();
} else {
return $el.text();
} }
return $el.text();
}, },
clicked: (selected, $el) => { clicked: (selected, $el) => {
const $link = $($el); const $link = $($el);
...@@ -58,33 +57,34 @@ ...@@ -58,33 +57,34 @@
toggle.disabled = true; toggle.disabled = true;
this.overrideLdap(memberListItem, $link.data('endpoint'), false); this.overrideLdap(memberListItem, $link.data('endpoint'), false);
} else { } else {
$btn.closest('form').trigger("submit.rails"); $btn.closest('form').trigger('submit.rails');
}
} }
},
}); });
}); });
} }
removeRow(e) { static removeRow(e) {
const $target = $(e.target); const $target = $(e.target);
if ($target.hasClass('btn-remove')) { if ($target.hasClass('btn-remove')) {
$target.closest('.member') $target.closest('.member')
.fadeOut(function () { .fadeOut(function fadeOutMemberRow() {
$(this).remove(); $(this).remove();
}); });
} }
} }
formSubmit() { formSubmit() {
$(this).closest('form').trigger("submit.rails").end().disable(); $(this).closest('form').trigger('submit.rails').end()
.disable();
} }
formSuccess() { formSuccess() {
$(this).find('.js-member-update-control').enable(); $(this).find('.js-member-update-control').enable();
} }
showLDAPPermissionsWarning (e) { showLDAPPermissionsWarning(e) {
const btn = e.currentTarget; const btn = e.currentTarget;
const memberListItem = this.getMemberListItem(btn); const memberListItem = this.getMemberListItem(btn);
const ldapPermissionsElement = memberListItem.nextElementSibling; const ldapPermissionsElement = memberListItem.nextElementSibling;
...@@ -96,11 +96,11 @@ ...@@ -96,11 +96,11 @@
} }
} }
getMemberListItem (btn) { static getMemberListItem(btn) {
return document.getElementById(btn.dataset.id); return document.getElementById(btn.dataset.id);
} }
toggleMemberAccessToggle (e) { toggleMemberAccessToggle(e) {
const btn = e.currentTarget; const btn = e.currentTarget;
const memberListItem = this.getMemberListItem(btn); const memberListItem = this.getMemberListItem(btn);
const toggle = memberListItem.querySelectorAll('.dropdown-menu-toggle')[0]; const toggle = memberListItem.querySelectorAll('.dropdown-menu-toggle')[0];
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
this.overrideLdap(memberListItem, btn.dataset.endpoint, true); this.overrideLdap(memberListItem, btn.dataset.endpoint, true);
} }
overrideLdap (memberListitem, endpoint, override) { static overrideLdap(memberListitem, endpoint, override) {
if (override) { if (override) {
memberListitem.classList.add('is-overriden'); memberListitem.classList.add('is-overriden');
} else { } else {
...@@ -123,12 +123,12 @@ ...@@ -123,12 +123,12 @@
type: 'PATCH', type: 'PATCH',
data: { data: {
group_member: { group_member: {
override override,
} },
} },
}) });
} }
} }
gl.Members = Members; gl.Members = Members;
})(window); })();
:plain :plain
var $listItem = $('#{escape_javascript(render('shared/members/member', member: @group_member))}'); var $listItem = $('#{escape_javascript(render('shared/members/member', member: @group_member))}');
$("##{dom_id(@group_member)} .list-item-name").replaceWith($listItem.find('.list-item-name')); $("##{dom_id(@group_member)} .list-item-name").replaceWith($listItem.find('.list-item-name'));
gl.utils.localTimeAgo($('.js-timeago'));
:plain :plain
var $listItem = $('#{escape_javascript(render('shared/members/member', member: @project_member))}'); var $listItem = $('#{escape_javascript(render('shared/members/member', member: @project_member))}');
$("##{dom_id(@project_member)} .list-item-name").replaceWith($listItem.find('.list-item-name')); $("##{dom_id(@project_member)} .list-item-name").replaceWith($listItem.find('.list-item-name'));
gl.utils.timeAgo($('.js-timeago'));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment