Merge pull request #490 from UCLALibrary/URS-495_Update-JQuery

Update jQuery to secure version
UCLALibrary · Oct 30, 2019 · 2aeb067 · 2aeb067
2 parents ad9a74b + 0f68be2
commit 2aeb067
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -83,7 +83,7 @@ gem 'devise-guests', '~> 0.7', '>= 0.7.0'
 gem 'flipflop'
 gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'httparty'
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.3', '>= 4.3.1'
 gem 'loofah', '>= 2.2.3'
 gem 'rsolr', '>= 1.0'
 gem 'solrizer'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -429,7 +429,7 @@ DEPENDENCIES
   flipflop
   font-awesome-rails (~> 4.7, >= 4.7.0.2)
   httparty
-  jquery-rails
+  jquery-rails (~> 4.3, >= 4.3.1)
   listen (>= 3.0.5, < 3.2)
   loofah (>= 2.2.3)
   mysql2 (~> 0.5)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,13 +10,13 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require rails-ujs
 //= require turbolinks
 //
 
 //= require tether
 // Required by Blacklight
-//= require jquery
+//= require jquery3
+//= require jquery_ujs
 //= require popper
 //= require bootstrap
 //= require blacklight/blacklight

diff --git a/app/views/catalog/_index.html.erb b/app/views/catalog/_index.html.erb
@@ -6,7 +6,7 @@
   <% doc_presenter.fields_to_render.each do | field_name, field | -%>
     <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
     <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
-    <% if field_name = "Description" %>
+    <% if field_name == "Description" %>
       <dt class="blacklight-<%= field_name.parameterize %> col-md-3"></dt>
       <dd class="blacklight-<%= field_name.parameterize %> col-md-9">&nbsp;&nbsp;&nbsp;</dd>
     <% end %>