Don’t add events in loop

1 files changed, 17 insertions, 19 deletions

diff --git a/app/assets/javascripts/member_expiration_date.js b/app/assets/javascripts/member_expiration_date.js
index cb166024b59..1935af491f7 100644
--- a/app/assets/javascripts/member_expiration_date.js
+++ b/app/assets/javascripts/member_expiration_date.js
@@ -5,30 +5,28 @@
   // datepicker, and make clicking on that element clear the field.
   //
   gl.MemberExpirationDate = function() {
-    $('.js-access-expiration-date').each(function(i, element) {
-      var expirationDateInput = $(element);
+    function toggleClearInput() {
+      $(this).closest('.clearable-input').toggleClass('has-value', $(this).val() !== '');
+    }
 
-      if (expirationDateInput.hasClass('hasDatepicker')) { return; }
+    var inputs = $('.js-access-expiration-date');
 
-      function toggleClearInput() {
-        expirationDateInput.closest('.clearable-input').toggleClass('has-value', expirationDateInput.val() !== '');
-      }
+    inputs.datepicker({
+      dateFormat: 'yy-mm-dd',
+      minDate: 1,
+      onSelect: toggleClearInput
+    });
 
-      expirationDateInput.datepicker({
-        dateFormat: 'yy-mm-dd',
-        minDate: 1,
-        onSelect: toggleClearInput
-      });
+    inputs.next('.js-clear-input').on('click', function(event) {
+      event.preventDefault();
 
-      expirationDateInput.on('blur', toggleClearInput);
+      var input = $(this).closest('.clearable-input').find('.js-access-expiration-date');
+      input.datepicker('setDate', null);
+      toggleClearInput.call(input);
+    });
 
-      toggleClearInput();
+    inputs.on('blur', toggleClearInput);
 
-      expirationDateInput.next('.js-clear-input').on('click', function(event) {
-        event.preventDefault();
-        expirationDateInput.datepicker('setDate', null);
-        toggleClearInput();
-      });
-    });
+    inputs.each(toggleClearInput);
   };
 }).call(this);