6410 jQuery Deprecations

fec/fec/static/js/legal.js

@@ -44,9 +44,9 @@ function KeywordModal() {
  */
 KeywordModal.prototype.handleSubmit = function(e) {
   e.preventDefault();
-  var queryString = this.generateQueryString();
+  const queryString = this.generateQueryString();
   this.$hiddenField.val(queryString);
-  this.$form.submit(); // TODO: jQuery deprecation? (.submit() )
+  this.$form.trigger('submit');
 };
 
 /**

fec/fec/static/js/modules/audit-category-sub-category.js

@@ -7,7 +7,7 @@
 import { buildUrl } from './helpers.js';
 
 export function auditCategorySubcategory() {
-  $('#primary_category_id').change(function() { // TODO: jQuery deprecation
+  $('#primary_category_id').on('change', function() {
     var $select = $('#sub_category_id');
     $.getJSON(
       buildUrl(['audit-category'], {

fec/fec/static/js/modules/audit_tags.js

@@ -6,7 +6,7 @@ import { default as auditCategoryTemplate } from '../templates/audit_tags.hbs';
 export default function auditTags() {
   $('.data-container__tags').prepend(auditCategoryTemplate);
   $('.tag__category.sub').css('visibility', 'hidden');
-  $('#primary_category_id').change(function() { // TODO: jQuery deprecation
+  $('#primary_category_id').on('change', function() {
     const current_category = $('#primary_category_id option:selected').text();
     $('.tag__category.sub').css('visibility', 'hidden');
     $('.tag__item.primary').contents()[0].nodeValue = `Findings and issue category: ${current_category}`;
@@ -15,17 +15,17 @@ export default function auditTags() {
       : $('.tag__item.primary button').show();
   });
 
-  $('#sub_category_id').change(function() { // TODO: jQuery deprecation
+  $('#sub_category_id').on('change', function() {
     const current_sub = $('#sub_category_id option:selected').text();
     $('.tag__item.sub').contents()[0].nodeValue = `Sub Category: ${current_sub}`;
   });
 
-  $('.js-close_sub').click(function() { // TODO: jQuery deprecation
+  $('.js-close_sub').on('click', function() {
     $('#primary_category_id').trigger('change');
     $('#sub_category_id').val('all');
   });
 
-  $('.js-close_primary').click(function() { // TODO: jQuery deprecation
+  $('.js-close_primary').on('click', function() {
     $('#primary_category_id').val('all');
     $('#primary_category_id').trigger('change');
     $('.tag__item.primary button').hide();

fec/fec/static/js/modules/calendar-tooltip.js

@@ -34,6 +34,6 @@ CalendarTooltip.prototype.close = function() {
   this.$content.remove();
   this.exportDropdown.destroy();
   this.$container.removeClass('is-active');
-  this.$container.focus(); // TODO: jQuery deprecation
+  this.$container.trigger('focus');
   this.events.clear();
 };

fec/fec/static/js/modules/calendar.js

@@ -336,10 +336,13 @@ Calendar.prototype.handleEventClick = function(calEvent, jsEvent) {
   }
 };
 
-// Simulate clicks when hitting enter on certain full-calendar elements
+/**
+* Simulate clicks when hitting enter on certain full-calendar elements
+* @param {jQuery.event} e
+*/
 Calendar.prototype.simulateClick = function(e) {
-  if (e.keyCode === 13) {
-    $(e.target).click(); // TODO: jQuery deprecation
+  if (e.which === 13) {
+    $(e.target).trigger('click');
   }
 };
 
@@ -350,8 +353,8 @@ Calendar.prototype.managePopoverControl = function(e) {
   $popover
     .find('.fc-close')
     .attr('tabindex', '0')
-    .focus() // TODO: jQuery deprecation
+    .trigger('focus')
     .on('click', function() {
-      $target.focus(); // TODO: jQuery deprecation
+      $target.trigger('focus');
     });
 };

fec/fec/static/js/modules/download.js

@@ -36,7 +36,7 @@ export function download(url, init, focus) {
   }
 
   if (focus) {
-    item.$button.focus(); // TODO: jQuery deprecation
+    item.$button.trigger('focus');
   }
 
   return item;

fec/fec/static/js/modules/dropdowns.js

@@ -85,7 +85,7 @@ Dropdown.prototype.toggle = function(e) {
 Dropdown.prototype.show = function() {
   restoreTabindex(this.$panel);
   this.$panel.attr('aria-hidden', 'false');
-  this.$panel.find('input[type="checkbox"]:first').focus(); // TODO: jQuery deprecation (:first and .focus)
+  this.$panel.find('input[type="checkbox"]').first().trigger('focus');
   this.$button.addClass('is-active');
   this.isOpen = true;
 };
@@ -116,20 +116,26 @@ Dropdown.prototype.handleFocusAway = function(e) {
   }
 };
 
+/**
+ * @param {JQuery.Event} e
+ */
 Dropdown.prototype.handleKeyup = function(e) {
-  if (e.keyCode === KEYCODE_ESC) {
+  if (e.which === KEYCODE_ESC) {
     if (this.isOpen) {
       this.hide();
-      this.$button.focus(); // TODO: jQuery deprecation
+      this.$button.trigger('focus');
     }
   }
 };
 
+/**
+ * @param {JQuery.Event} e
+ */
 Dropdown.prototype.handleCheckKeyup = function(e) {
-  if (e.keyCode === KEYCODE_ENTER) {
+  if (e.which === KEYCODE_ENTER) {
     $(e.target)
       .prop('checked', true)
-      .change(); // TODO: jQuery deprecation
+      .trigger('change');
   }
 };
 
@@ -145,7 +151,7 @@ Dropdown.prototype.handleDropdownItemClick = function(e) {
   const $input = this.$selected.find('#' + $button.data('label'));
 
   if (!$button.hasClass('is-checked')) {
-    $input.click(); // TODO: jQuery deprecation
+    $input.trigger('click');
   }
 };
 
@@ -221,14 +227,14 @@ Dropdown.prototype.selectItem = function($input) {
     if (next.length) {
       $(next[0])
         .find('input[type="checkbox"]')
-        .focus(); // TODO: jQuery deprecation
+        .trigger('focus');
     } else if (prev.length) {
       $(prev[0])
         .find('input[type="checkbox"]')
-        .focus(); // TODO: jQuery deprecation
+        .trigger('focus');
     }
   } else {
-    this.$selected.find('input[type="checkbox"]').focus(); // TODO: jQuery deprecation
+    this.$selected.find('input[type="checkbox"]').trigger('focus');
   }
 };
 

fec/fec/static/js/modules/election-map.js

@@ -166,7 +166,7 @@ ElectionMap.prototype.drawBackgroundDistricts = function(districts) {
     .map(function(district) {
       return Math.floor(district / 100);
     })
-    .unique() // TODO: jQuery deprecation
+    .uniqueSort()
     .value();
   var stateDistricts = _filter(districtFeatures.features, function(
     feature

fec/fec/static/js/modules/election-search.js

@@ -220,7 +220,7 @@ ElectionSearch.prototype.getUpcomingElections = function() {
  * Handle a change event on the zip code fields
  */
 ElectionSearch.prototype.handleZipChange = function() {
-  this.$state.val('').change(); // TODO: jQuery deprecation
+  this.$state.val('').trigger('change');
   this.$district.val('');
 };
 

fec/fec/static/js/modules/filters/date-filter.js

@@ -136,8 +136,8 @@ DateFilter.prototype.fromQuery = function(query) {
 
 DateFilter.prototype.setValue = function(value) {
   value = ensureArray(value);
-  this.$minDate.val(value[0]).change(); // TODO: jQuery deprecation
-  this.$maxDate.val(value[1]).change(); // TODO: jQuery deprecation
+  this.$minDate.val(value[0]).trigger('change');
+  this.$maxDate.val(value[1]).trigger('change');
 };
 
 DateFilter.prototype.handleModifyEvent = function(e, opts) {
@@ -146,12 +146,12 @@ DateFilter.prototype.handleModifyEvent = function(e, opts) {
   if (opts.filterName === this.name) {
     this.maxYear = parseInt(opts.filterValue);
     this.minYear = this.maxYear - 1;
-    this.$minDate.val('01/01/' + this.minYear.toString()).change(); // TODO: jQuery deprecation
+    this.$minDate.val('01/01/' + this.minYear.toString()).trigger('change');
     if (this.maxYear === today.getFullYear()) {
       today = moment(today).format('MM/DD/YYYY');
-      this.$maxDate.val(today).change(); // TODO: jQuery deprecation
+      this.$maxDate.val(today).trigger('change');
     } else {
-      this.$maxDate.val('12/31/' + this.maxYear.toString()).change(); // TODO: jQuery deprecation
+      this.$maxDate.val('12/31/' + this.maxYear.toString()).trigger('change');
     }
     this.validate();
   }
@@ -239,29 +239,32 @@ DateFilter.prototype.handleMinDateSelect = function() {
   this.$grid.find('.is-active').removeClass('is-active');
   $dateBegin.addClass('is-active');
 
-  this.$grid.find('li').hover( // TODO: jQuery deprecation
-    function() {
-      var dateBeginNum = parseInt(
-        $(this)
-          .parent()
-          .attr('data-year') + $(this).attr('data-month')
-      );
-      var dateEndNum = parseInt(
-        $dateEnd.parent().attr('data-year') + $dateEnd.attr('data-month')
-      );
-
-      if (dateBeginNum <= dateEndNum) {
-        self.$grid.removeClass('is-invalid');
-        self.handleDateGridRange($(this), $dateEnd);
-      } else {
-        self.$grid.addClass('is-invalid');
+  this.$grid.find('li')
+    .on('mouseenter',
+      function() {
+        var dateBeginNum = parseInt(
+          $(this)
+            .parent()
+            .attr('data-year') + $(this).attr('data-month')
+        );
+        var dateEndNum = parseInt(
+          $dateEnd.parent().attr('data-year') + $dateEnd.attr('data-month')
+        );
+
+        if (dateBeginNum <= dateEndNum) {
+          self.$grid.removeClass('is-invalid');
+          self.handleDateGridRange($(this), $dateEnd);
+        } else {
+          self.$grid.addClass('is-invalid');
+        }
       }
-    },
-    function() {
-      self.handleDateGridRange($dateBegin, $dateEnd);
-      $dateBegin.addClass('is-active');
-    }
-  );
+    )
+    .on('mouseleave',
+      function() {
+        self.handleDateGridRange($dateBegin, $dateEnd);
+        $dateBegin.addClass('is-active');
+      }
+    );
 };
 
 DateFilter.prototype.handleMaxDateSelect = function() {
@@ -276,31 +279,34 @@ DateFilter.prototype.handleMaxDateSelect = function() {
   this.$grid.find('.is-active').removeClass('is-active');
   $dateEnd.addClass('is-active');
 
-  this.$grid.find('li').hover( // TODO: jQuery deprecation
-    function() {
-      // turn dates to numbers for comparsion
-      // to make sure hover date range is valid
-      var dateBeginNum = parseInt(
-        $dateBegin.parent().attr('data-year') + $dateBegin.attr('data-month')
-      );
-      var dateEndNum = parseInt(
-        $(this)
-          .parent()
-          .attr('data-year') + $(this).attr('data-month')
-      );
-
-      if (dateBeginNum <= dateEndNum) {
-        self.$grid.removeClass('is-invalid');
-        self.handleDateGridRange($dateBegin, $(this));
-      } else {
-        self.$grid.addClass('is-invalid');
+  this.$grid.find('li')
+    .on('mouseenter',
+      function() {
+        // turn dates to numbers for comparsion
+        // to make sure hover date range is valid
+        var dateBeginNum = parseInt(
+          $dateBegin.parent().attr('data-year') + $dateBegin.attr('data-month')
+        );
+        var dateEndNum = parseInt(
+          $(this)
+            .parent()
+            .attr('data-year') + $(this).attr('data-month')
+        );
+
+        if (dateBeginNum <= dateEndNum) {
+          self.$grid.removeClass('is-invalid');
+          self.handleDateGridRange($dateBegin, $(this));
+        } else {
+          self.$grid.addClass('is-invalid');
+        }
       }
-    },
-    function() {
-      self.handleDateGridRange($dateBegin, $dateEnd);
-      $dateEnd.addClass('is-active');
-    }
-  );
+    )
+    .on('mouseleave',
+      function() {
+        self.handleDateGridRange($dateBegin, $dateEnd);
+        $dateEnd.addClass('is-active');
+      }
+    );
 };
 
 DateFilter.prototype.handleGridItemSelect = function(e) {
@@ -331,10 +337,10 @@ DateFilter.prototype.handleGridItemSelect = function(e) {
       ? this.$maxDate
       : this.$submit;
     this.$grid.removeClass('pick-min pick-max');
-    this.$grid.find('li').unbind('mouseenter mouseleave'); // TODO: jQuery deprecation (.unbind())
+    this.$grid.find('li').off('mouseenter mouseleave');
     this.setValue(value);
     this.$grid.addClass('is-invalid');
-    $nextItem.focus(); // TODO: jQuery deprecation
+    $nextItem.trigger('focus');
   }
 };
 

fec/fec/static/js/modules/filters/election-filter.js

@@ -43,7 +43,7 @@ ElectionFilter.prototype.fromQuery = function(query) {
     this.$cycles
       .find('input[value="' + cycle + ':' + full + '"]')
       .prop('checked', true)
-      .change(); // TODO: jQuery deprecation
+      .trigger('change');
   }
   return this;
 };
@@ -80,7 +80,7 @@ ElectionFilter.prototype.handleElectionChange = function(e) {
     .find('input')
     .eq(0)
     .prop('checked', true)
-    .change(); // TODO: jQuery deprecation
+    .trigger('change');
 };
 
 ElectionFilter.prototype.handleCycleChange = function(e) {
@@ -89,9 +89,9 @@ ElectionFilter.prototype.handleCycleChange = function(e) {
     .split(':');
   this.$cycle
     .val(selected[0])
-    .change() // TODO: jQuery deprecation
+    .trigger('change')
     .attr('checked', true);
-  this.$full.val(selected[1]).change(); // TODO: jQuery deprecation
+  this.$full.val(selected[1]).trigger('change');
   this.setTag();
 };
 

fec/fec/static/js/modules/filters/filter-base.js

@@ -84,7 +84,7 @@ Filter.prototype.setValue = function(value) {
   const $input = this.$input.data('temp')
     ? this.$elm.find('#' + this.$input.data('temp'))
     : this.$input;
-  $input.val(prepareValue($input, value)).change(); // TODO: jQuery deprecation
+  $input.val(prepareValue($input, value)).trigger('change');
   return this;
 };
 

fec/fec/static/js/modules/filters/filter-panel.js

@@ -65,7 +65,7 @@ FilterPanel.prototype.show = function(focus) {
     this.$body
       .find('input, select, button:not(.js-filter-close)')
       .first()
-      .focus(); // TODO: jQuery deprecation
+      .trigger('focus');
   }
 };
 
@@ -76,7 +76,7 @@ FilterPanel.prototype.hide = function() {
   }
   this.$body.removeClass('is-open');
   this.$content.attr('aria-hidden', true);
-  this.$focus.focus(); // TODO: jQuery deprecation
+  this.$focus.trigger('focus');
   removeTabindex(this.$form);
   $('body').removeClass('is-showing-filters');
   this.isOpen = false;