Merge pull request #1309 from ElixirTeSS/fix-jquery

Fix jQuery version

Author: fbacall

Gemfile.lock

@@ -246,7 +246,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jquery-qtip2-wrapper-rails (3.0.3)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.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.turbolinks
 //= require jquery_ujs
 //= require bootstrap-sprockets
@@ -79,8 +79,7 @@ const Index = {
 
 // Perform an ajax request to load the calendar and replace the contents
 window.loadCalendar = function(url) {
-    req = $.ajax(url);
-    req.done((res) => eval(res));
+    $.ajax(url, { dataType: 'script', cache: true }); // Is loaded automatically.
     return true;
 }
 

app/views/events/index.html.erb

@@ -26,7 +26,7 @@
       <ul class="nav nav-xs nav-pills index-display-options">
         <%# We should consider setting the active status based on the query fragment so we can deeplink %>
         <%= tab('List', 'fa fa-list', 'home', active: true) %>
-        <%= tab('Calendar', 'fa fa-calendar', 'calendar', options: { 'data-calendar': calendar_events_path(search_and_facet_params.merge(format: :js, per_page: 200))}) %>
+        <%= tab('Calendar', 'fa fa-calendar', 'calendar', options: { 'data-calendar': calendar_events_path(search_and_facet_params.merge(per_page: 200))}) %>
         <% if TeSS::Config.map_enabled %>
           <%= tab('Map', 'fa fa-globe', 'map',
                   disabled: { check: (search_and_facet_params[:online] == 'true'),