Merge pull request #4051 from rockandror/upgrade_jquery

Upgrade to jQuery 3.5.1

Gemfile

@@ -29,7 +29,7 @@ gem "groupdate", "~> 5.1.0"
 gem "initialjs-rails", "~> 0.2.0.9"
 gem "invisible_captcha", "~> 0.10.0"
 gem "jquery-fileupload-rails"
-gem "jquery-rails", "~> 4.3.3"
+gem "jquery-rails", "~> 4.4.0"
 gem "jquery-ui-rails", "~> 6.0.1"
 gem "kaminari", "~> 1.2.1"
 gem "newrelic_rpm", "~> 4.1.0.333"

Gemfile.lock

@@ -292,7 +292,7 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       sassc
-    jquery-rails (4.3.3)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -665,7 +665,7 @@ DEPENDENCIES
   initialjs-rails (~> 0.2.0.9)
   invisible_captcha (~> 0.10.0)
   jquery-fileupload-rails
-  jquery-rails (~> 4.3.3)
+  jquery-rails (~> 4.4.0)
   jquery-ui-rails (~> 6.0.1)
   kaminari (~> 1.2.1)
   knapsack_pro (~> 1.15.0)

app/assets/javascripts/application.js

@@ -10,7 +10,7 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery3
 //= require jquery_ujs
 //= require jquery-ui/widgets/datepicker
 //= require jquery-ui/i18n/datepicker-ar

app/assets/javascripts/dashboard_graphs.js

@@ -286,7 +286,7 @@
     return this.groupBy === undefined || this.groupBy === "" || this.groupBy === null;
   };
 
-  $(document).ready(function() {
+  $(function() {
     $("[data-proposal-graph-url]").each(function() {
       var graph = new ProposalGraph($(this).data("proposal-graph-url"));
       graph.successfulProposalDataUrl = $(this).data("successful-proposal-graph-url");

app/assets/javascripts/globalize.js

@@ -7,7 +7,7 @@
     display_locale: function(locale) {
       App.Globalize.enable_locale(locale);
       App.Globalize.add_language(locale);
-      $(".js-add-language option:selected").removeAttr("selected");
+      $(".js-add-language option:selected").prop("selected", false);
     },
     display_translations: function(locale) {
       $(".js-select-language option[value=" + locale + "]").prop("selected", true);

app/assets/javascripts/legislation_admin.js

@@ -8,11 +8,7 @@
           checkbox = $(this);
 
           checkbox.closest("fieldset").find("input[type='date']").each(function() {
-            if (checkbox.is(":checked")) {
-              $(this).removeAttr("disabled");
-            } else {
-              $(this).prop("disabled", true);
-            }
+            $(this).prop("disabled", !checkbox.is(":checked"));
           });
         }
       }).trigger("change");

app/assets/javascripts/legislation_annotatable.js

@@ -109,7 +109,7 @@
         });
         if ($("[data-legislation-open-phase]").data("legislation-open-phase") !== false) {
           App.LegislationAnnotatable.highlight("#7fff9a");
-          $("#comments-box textarea").focus();
+          $("#comments-box textarea").trigger("focus");
           $("#new_legislation_annotation").on("ajax:complete", function(e, data) {
             if (data.status === 200) {
               App.LegislationAnnotatable.remove_highlight();

app/views/admin/poll/questions/answers/images/destroy.js.erb

@@ -1,3 +1,3 @@
-$(".delete").bind("ajax:success", function () {
-  $(this).closest("div").fadeOut()
-})
+$(".delete").on("ajax:success", function () {
+  $(this).closest("div").fadeOut();
+});

app/views/legislation/annotations/_comments_box_form.js.erb

@@ -1,5 +1,5 @@
 <% if comment.errors.any? %>
   $("#comments-box-<%= @annotation.id %> a.publish-comment").hide();
   $("#js-comment-form-annotation-<%= annotation.id %>").toggle();
-  $("#js-comment-form-annotation-<%= annotation.id %> textarea").focus();
+  $("#js-comment-form-annotation-<%= annotation.id %> textarea").trigger("focus");
 <% end %>

spec/system/admin/translatable_spec.rb

@@ -493,6 +493,7 @@ describe "Admin edit translatable records" do
       select "Français", from: :add_language
 
       expect_to_have_language_selected "Français"
+      expect(page).to have_select :add_language, selected: "Add language"
       expect(page).to have_field "contents_content_#{content.key}values_value_fr"
     end