blacklight-gallery 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a0883ccc5d8a704089cb412b638f5c23e8a4c99c17f975ed9783e5bf2e0f73
-  data.tar.gz: a1535e02691bfcc2c282b5e4df8eb95d87f0f1a646b8c4d8aace0e5cba231b39
+  metadata.gz: 7744bdfee07565681b5a97da2ce04211bd23fc72aafcb57b1578a185fde775fe
+  data.tar.gz: dbda74765d58efa3dc60e8b06b184102c53a5bd53bfb4e83daf67df14dd6a85b
 SHA512:
-  metadata.gz: 5e897d9dd4f500ca90f25ce99375ffd01b23627e1c1c3782c760c8d5393dd34164c3a77febf0adcab25efcee3e7d215d73fe79a0e1dd79241a593d8c0ab0ec64
-  data.tar.gz: 2c2d9760850e5718537c471737d74719f3555f702df073c243438d93cfc09ddf6488abb4f2bc99fe8d5ed84b83cc57e9d1c79234e1aad97caabd5b0110f96eae
+  metadata.gz: b545ffac529924cd4844c3b88848fea59ec5d4dae3c3c9e36734e3aa2d4742b4298a7679d1475f7e1579f4c9ec849def3c4abf28b341741bac7946da2e968db2
+  data.tar.gz: b030ffa84501c52300ef27a736f457f29dc106b1a89e2242acc95323484cbfb316c932d45a41cc13c5edfdc9e4192dfba2ab5d541bef9bda43accde55cc4db72

data/.github/workflows/ruby.yml

@@ -43,7 +43,7 @@ jobs:
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:

data/app/assets/javascripts/blacklight_gallery/slideshow.js

@@ -84,10 +84,12 @@
         _this.play();
       });
 
-      $(document).on('click', '[data-slide], [data-slide-to]', function(e) {
+      $(document).on('click', '[data-slide], [data-bs-slide], [data-slide-to], [data-bs-slide-to]', function(e) {
         e.preventDefault();
 
-        pos = parseInt($(this).attr('data-slide-to'), 10) || $(this).attr('data-slide');
+        pos = parseInt($(this).attr('data-slide-to') || $(this).attr('data-bs-slide-to'), 10) ||
+                $(this).attr('data-slide') ||
+                $(this).attr('data-bs-slide');
 
         if (pos === 'next' || pos === 'prev') _this.pause();
         _this.to(pos);

data/app/components/blacklight/gallery/slideshow_preview_component.html.erb

@@ -4,6 +4,8 @@
 %> 
 <%= render(component) do |component| %>
   <% component.with_body do %>
-    <%= @view_context.link_to_document(@document, thumbnail, class: 'thumbnail', data: { 'context-href': nil, 'slide-to': @document_counter, toggle: "modal", target: "#slideshow-modal" }) %>
+    <%= @view_context.link_to_document(@document, thumbnail, class: 'thumbnail',
+                                       data: { 'context-href': nil, 'slide-to': @document_counter, 'bs-slide-to': @document_counter,
+                                       toggle: "modal", 'bs-toggle': "modal", target: "#slideshow-modal", 'bs-target': "#slideshow-modal" }) %>
   <% end %>
 <% end %>

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

@@ -14,10 +14,10 @@
       </div>
 
       <!-- Controls -->
-      <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
+      <a class="left carousel-control prev" href="#slideshow" data-slide="prev" data-bs-slide="prev">
         <%= render Blacklight::Gallery::Icons::ChevronLeftComponent.new additional_options: { label_context: 'previous_image' } %>
       </a>
-      <a class="right carousel-control next" href="#slideshow" data-slide="next">
+      <a class="right carousel-control next" href="#slideshow" data-slide="next" data-bs-slide="next">
         <%= render Blacklight::Gallery::Icons::ChevronRightComponent.new additional_options: { label_context: 'next_image' } %>
       </a>
 

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

@@ -3,8 +3,8 @@
     <div class="modal-dialog modal-xl">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="blacklight-modal-close btn-close close btn-close-white" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+            <span aria-hidden="true" class="visually-hidden">&times;</span>
           </button>
         </div>
         <div class="modal-body">

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "4.4.0"
+    VERSION = "4.5.0"
   end
 end

data/lib/generators/blacklight_gallery/install_generator.rb

@@ -29,7 +29,7 @@ module BlacklightGallery
 
     def assets
       copy_file "blacklight_gallery.css.scss", "app/assets/stylesheets/blacklight_gallery.css.scss"
-      append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight_gallery/manifest.js"
+      append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight_gallery/manifest.js\n"
       copy_file "blacklight_gallery.js", "app/assets/javascripts/blacklight_gallery.js"
 
       insert_into_file "app/assets/javascripts/application.js", after: '//= require blacklight/blacklight' do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-gallery",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Gallery views for Blacklight search results",
   "main": "app/assets/javascripts/blacklight_gallery/default.js",
   "files": [

data/spec/features/slideshow_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "Slideshow", :js, :type => :feature do
+RSpec.describe 'Slideshow', default_max_wait_time: 10, js: true do
 
-  it "should open when one of the grid panes are clicked" do
-    visit search_catalog_path( :q => 'medicine', :view => 'slideshow' )
-    expect(page).to have_content "You searched for:"
-    within ".view-type" do
-      click_link "Slideshow"
+  it 'opens when one of the grid panes is clicked' do
+    visit search_catalog_path( q: 'medicine', view: 'slideshow' )
+    expect(page).to have_content 'You searched for:'
+    within '.view-type' do
+      click_link 'Slideshow'
     end
 
-    find('.grid [data-slide-to="0"]').click
+    find('.grid [data-slide-to="0"], .grid [data-bs-slide-to="0"]').click
+    expect(page).to have_css('.slideshow-inner .item')
   end
-
 end

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

@@ -30,8 +30,9 @@ RSpec.describe "catalog/_document_slideshow", :type => :view do
   it 'has a modal' do
     render 'catalog/document_slideshow', view_config: view_config
     expect(rendered).to have_selector '#slideshow-modal'
-    expect(rendered).to have_selector '[data-slide="prev"]'
-    expect(rendered).to have_selector '[data-slide="next"]'
-    expect(rendered).to have_selector '[data-slide-to="0"][data-toggle="modal"][data-target="#slideshow-modal"]'
+    expect(rendered).to have_selector '[data-slide="prev"][data-bs-slide="prev"]'
+    expect(rendered).to have_selector '[data-slide="next"][data-bs-slide="next"]'
+    expect(rendered).to have_selector '[data-slide-to="0"][data-bs-slide-to="0"][data-toggle="modal"]' \
+                                      '[data-bs-toggle="modal"][data-target="#slideshow-modal"]'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Gallery display for Blacklight