From 1f3a0d52a36fda712ff07bc0ad71d44146c1953b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Thu, 18 Aug 2016 19:02:36 -0500
Subject: [PATCH] Use `gl` namespace and explicitly check that string is empty
---
app/assets/javascripts/dispatcher.js | 6 +++---
app/assets/javascripts/member_expiration_date.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index be473bc4795..49dcbf82d9e 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -126,12 +126,12 @@
new NotificationsDropdown();
break;
case 'groups:group_members:index':
- new MemberExpirationDate();
+ new gl.MemberExpirationDate();
new GroupMembers();
new UsersSelect();
break;
case 'projects:project_members:index':
- new MemberExpirationDate();
+ new gl.MemberExpirationDate();
new ProjectMembers();
new UsersSelect();
break;
@@ -173,7 +173,7 @@
new BuildArtifacts();
break;
case 'projects:group_links:index':
- new MemberExpirationDate();
+ new gl.MemberExpirationDate();
new GroupsSelect();
break;
case 'search:show':
diff --git a/app/assets/javascripts/member_expiration_date.js b/app/assets/javascripts/member_expiration_date.js
index 93c34d5ccd7..cb166024b59 100644
--- a/app/assets/javascripts/member_expiration_date.js
+++ b/app/assets/javascripts/member_expiration_date.js
@@ -4,14 +4,14 @@
// `js-clear-input` element, then show that element when there is a value in the
// datepicker, and make clicking on that element clear the field.
//
- this.MemberExpirationDate = function() {
+ gl.MemberExpirationDate = function() {
$('.js-access-expiration-date').each(function(i, element) {
var expirationDateInput = $(element);
if (expirationDateInput.hasClass('hasDatepicker')) { return; }
function toggleClearInput() {
- expirationDateInput.parent().toggleClass('has-value', !!expirationDateInput.val());
+ expirationDateInput.closest('.clearable-input').toggleClass('has-value', expirationDateInput.val() !== '');
}
expirationDateInput.datepicker({
--
GitLab