blacklight 7.4.0 → 7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d5576219e73622cf05af970590c5492d1e7f18a2b1a3654fb26de71d424b64
-  data.tar.gz: 94a2e2b0b64d07b4fe0083df1e7658130c6d9dfba7c3acae4ee5b930a1ceb74c
+  metadata.gz: e85413f5ec17400714a059ee6085c1dd7df348697cecf371d4d1aef37d1025c6
+  data.tar.gz: 05ac84ca08a7ba17f6eec011e06df185523c96d0562b255c0b5cdfc777e3e2bb
 SHA512:
-  metadata.gz: 9d8fbf65bfad8b2d4dfac62bb3048dfdebca06f4752b6b66bfbfce218afa1b5deef6b7865896056760c1f7265e7d5968ffa3d52511ce49d54004a118191261b9
-  data.tar.gz: f1921d4f36915aa5761788ae8a80ddb1836777c2a6db8613d01987930af30ac8d2a273ccea62ecdbcb502c3716747a4ea551a64cc02b3cda7e1ade71067ddbb2
+  metadata.gz: e510c3ca5b812ea54cfabeb5f601ff90a016b13a9cdf7c9c762875d2f68807aa1dbb98adcbf6b0c3bccb42bc12b724480e447f12ea2921730ac4ef27b40e9215
+  data.tar.gz: 18bf32778bae7470b066341bd99fb170e50048cee6c54ed319fbf9c113adcc922a72ae65492bae2d4cfeaec24b4ede3aa5a37345c7ba655765505b224b3ed6fc

data/VERSION

@@ -1 +1 @@
-7.4.0
+7.4.1

data/app/assets/javascripts/blacklight/blacklight.js

@@ -441,7 +441,7 @@ Blacklight.doSearchContextBehavior = function () {
   const nodes = Array.prototype.slice.call(elements);
   nodes.forEach(function (element) {
     element.addEventListener('click', function (e) {
-      Blacklight.handleSearchContextMethod.call(e.target, e);
+      Blacklight.handleSearchContextMethod.call(e.currentTarget, e);
     });
   });
 }; // this is the Rails.handleMethod with a couple adjustments, described inline:

data/app/assets/stylesheets/blacklight/_header.scss

@@ -9,7 +9,7 @@
   }
 }
 
-.navbar-brand {  /* The main logo image for the Blacklight instance */
+.navbar-logo {  /* The main logo image for the Blacklight instance */
   @if $logo-image {
     background: transparent $logo-image no-repeat top left;
   }

data/app/javascript/blacklight/search_context.js

@@ -10,7 +10,7 @@ Blacklight.doSearchContextBehavior = function() {
 
   nodes.forEach(function(element) {
     element.addEventListener('click', function(e) {
-      Blacklight.handleSearchContextMethod.call(e.target, e)
+      Blacklight.handleSearchContextMethod.call(e.currentTarget, e)
     })
   })
 };

data/app/views/catalog/_facet_layout.html.erb

@@ -1,7 +1,7 @@
 <div class="card facet-limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet-limit-active' if facet_field_in_params?(facet_field.key) %>">
   <h3 class="card-header p-0 facet-field-heading" id="<%= facet_field_id(facet_field) %>-header">
     <button
-      class="btn btn-block p-2 text-left collapse-toggle"
+      class="btn btn-block p-2 text-left collapse-toggle <%= "collapsed" if should_collapse_facet?(facet_field) %>"
       data-toggle="collapse"
       data-target="#<%= facet_field_id(facet_field) %>"
       aria-expanded="<%= should_collapse_facet?(facet_field) ? 'false' : 'true' %>"
@@ -10,7 +10,7 @@
     </button>
   </h3>
   <div id="<%= facet_field_id(facet_field) %>" aria-labelledby="<%= facet_field_id(facet_field) %>-header" class="panel-collapse facet-content collapse <%= "show" unless should_collapse_facet?(facet_field) %>">
-    <div  class="card-body">
+    <div class="card-body">
       <%= yield %>
     </div>
   </div>

data/app/views/shared/_header_navbar.html.erb

@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
   <div class="<%= container_classes %>">
-    <%= link_to application_name, root_path, class: 'mb-0 navbar-brand' %>
+    <%= link_to application_name, root_path, class: 'mb-0 navbar-brand navbar-logo' %>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>

data/lib/blacklight/configuration.rb

@@ -357,29 +357,41 @@ module Blacklight
     ##
     # Return a list of fields for the index display that should be used for the
     # provided document.  This respects any configuration made using for_display_type
-    def index_fields_for(document_or_display_type)
-      display_type = if document_or_display_type.is_a? Blacklight::Document
-                       Deprecation.warn self, "Calling index_fields_for with a #{document_or_display_type.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
-                       document_or_display_type.first(index.display_type_field)
-                     else
-                       document_or_display_type
-                     end
+    def index_fields_for(document_or_display_types)
+      display_types = if document_or_display_types.is_a? Blacklight::Document
+                        Deprecation.warn self, "Calling index_fields_for with a #{document_or_display_types.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
+                        document_or_display_types[index.display_type_field]
+                      else
+                        document_or_display_types
+                      end
+
+      fields = {}.with_indifferent_access
+
+      Array.wrap(display_types).each do |display_type|
+        fields = fields.merge(for_display_type(display_type).index_fields)
+      end
 
-      for_display_type(display_type).index_fields.merge(index_fields)
+      fields.merge(index_fields)
     end
 
     ##
     # Return a list of fields for the show page that should be used for the
     # provided document.  This respects any configuration made using for_display_type
-    def show_fields_for(document_or_display_type)
-      display_type = if document_or_display_type.is_a? Blacklight::Document
-                       Deprecation.warn self, "Calling show_fields_for with a #{document_or_display_type.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
-                       document_or_display_type.first(show.display_type_field)
-                     else
-                       document_or_display_type
-                     end
-
-      for_display_type(display_type).show_fields.merge(show_fields)
+    def show_fields_for(document_or_display_types)
+      display_types = if document_or_display_types.is_a? Blacklight::Document
+                        Deprecation.warn self, "Calling show_fields_for with a #{document_or_display_types.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
+                        document_or_display_types[show.display_type_field]
+                      else
+                        document_or_display_types
+                      end
+
+      fields = {}.with_indifferent_access
+
+      Array.wrap(display_types).each do |display_type|
+        fields = fields.merge(for_display_type(display_type).show_fields)
+      end
+
+      fields.merge(show_fields)
     end
 
     private

data/spec/models/blacklight/configuration_spec.rb

@@ -115,10 +115,10 @@ RSpec.describe "Blacklight::Configuration", api: true do
       end
       config.add_index_field :title
 
-      expect(config.index_fields_for('Image')).to have_key 'dimensions'
-      expect(config.index_fields_for('Image')).to have_key 'title'
-      expect(config.index_fields_for('Sound')).not_to have_key 'dimensions'
-      expect(config.index_fields_for('Image')).to have_key 'title'
+      expect(config.index_fields_for(['Image'])).to have_key 'dimensions'
+      expect(config.index_fields_for(['Image'])).to have_key 'title'
+      expect(config.index_fields_for(['Sound'])).not_to have_key 'dimensions'
+      expect(config.index_fields_for(['Image'])).to have_key 'title'
       expect(config.index_fields).not_to have_key 'dimensions'
     end
 
@@ -128,10 +128,10 @@ RSpec.describe "Blacklight::Configuration", api: true do
       end
       config.add_show_field :title
 
-      expect(config.show_fields_for('Image')).to have_key 'dimensions'
-      expect(config.show_fields_for('Image')).to have_key 'title'
-      expect(config.show_fields_for('Sound')).not_to have_key 'dimensions'
-      expect(config.show_fields_for('Image')).to have_key 'title'
+      expect(config.show_fields_for(['Image'])).to have_key 'dimensions'
+      expect(config.show_fields_for(['Image'])).to have_key 'title'
+      expect(config.show_fields_for(['Sound'])).not_to have_key 'dimensions'
+      expect(config.show_fields_for(['Image'])).to have_key 'title'
       expect(config.show_fields).not_to have_key 'dimensions'
     end
 
@@ -143,8 +143,8 @@ RSpec.describe "Blacklight::Configuration", api: true do
         c.add_show_field :photographer
       end
 
-      expect(config.show_fields_for('Image')).to have_key 'dimensions'
-      expect(config.show_fields_for('Image')).to have_key 'photographer'
+      expect(config.show_fields_for(['Image'])).to have_key 'dimensions'
+      expect(config.show_fields_for(['Image'])).to have_key 'photographer'
     end
   end
 

data/spec/views/catalog/_facet_layout.html.erb_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe "catalog/facet_layout" do
 
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'button[data-toggle="collapse"][aria-expanded="false"]'
+    expect(rendered).to have_selector 'button.collapsed[data-toggle="collapse"][aria-expanded="false"]'
     expect(rendered).to have_selector '.collapse .card-body'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails