blacklight-spotlight 5.0.0.pre.alpha2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b768d28b08beb72ad790c25c5bc961dde7f12aa0b9e518f3d8ff04ea326de6
-  data.tar.gz: 82ddfae5ccdd6b754a72050b5966dd3e11b4db6fda2a18f5bd2348a4c186e182
+  metadata.gz: a26266b1d604813d250c2b425946aac71d949a2fbab512afc7df223b47e05289
+  data.tar.gz: d83e03919f89b14dacb40962671ceff6423293055d08195e976156e6dfa312d1
 SHA512:
-  metadata.gz: bc40beb8d7e6c7fe609279af38d5456112e32110e25f272fc8cb47274a212618f23aa14e50643a03abc93eb65b7f9013574e9435bab5dab68fdc2e6d79961c48
-  data.tar.gz: 494367ee396448177230ec9347b3c92ac628ba384b699e23c5dae86bca834f6ffbc390fe57fe94ed849b6493a5e37e9c3a3af46103457ed1359f332ce64e1a2a
+  metadata.gz: 158c210f757f5f4d264e9015b6b6e274ea2a6fbc4623d681fee5705cf189aaae248936b271079ee2419ef6ee81c4e55095de0ed730614d2d75b1fdfa7f872b53
+  data.tar.gz: 28b4acb8124c98fc4c55a445626e89fca4d937e409a7146250ddfbb41fe52f9a9096f7a215ea6165562e04e2acd108093933caae0e4cd449e0edc668a52b8d33

data/app/assets/javascripts/spotlight/spotlight.esm.js

@@ -3304,10 +3304,10 @@ class ZprLinks {
       modalDialog.addClass('modal-xl');
       modalContent.html('<div id="osd-modal-container"></div>');
       var controls = `<div class="controls d-flex justify-content-center justify-content-md-end">
-          <div class="custom-close-controls pr-3 pe-3 pt-3">
-            <button type="button" class="btn btn-dark" data-dismiss="modal" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
+          <div class="custom-close-controls pe-3 pt-3">
+            <button type="button" class="btn btn-dark" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
           </div>
-          <div class="zoom-controls mb-3 mr-md-3 me-md-3">
+          <div class="zoom-controls mb-3 me-md-3">
             <button id="osd-zoom-in" type="button" class="btn btn-dark">${Spotlight.ZprLinks.zoomIn}</button>
             <button id="osd-zoom-out" type="button" class="btn btn-dark">${Spotlight.ZprLinks.zoomOut}</button>
           </div>
@@ -3556,10 +3556,11 @@ class Iiif {
     it[Symbol.iterator] = function*() {
       for (let canvas of context.canvases()) {
         for (let image of canvas.images) {
-          var iiifService = image.resource.service['@id'];
+          var iiifService = image.resource?.service || image.resource?.default?.service;
+          var iiifServiceId = iiifService['@id'];
           yield {
-            'thumb': iiifService + '/full/!100,100/0/default.jpg',
-            'tilesource': iiifService + '/info.json',
+            'thumb': iiifServiceId + '/full/!100,100/0/default.jpg',
+            'tilesource': iiifServiceId + '/info.json',
             'manifest': context.manifestUrl,
             'canvasId': canvas['@id'],
             'imageId': image['@id']
@@ -5147,7 +5148,7 @@ class Users {
     function edit_user(event) {
       event.preventDefault();
       $(this).closest('tr').hide();
-      const id = $(this).attr('data-target') || $(this).attr('data-bs-target');
+      const id = $(this).attr('data-target');
       const edit_view = $("[data-edit-for='"+id+"']", container).show();
       $.each(edit_view.find('input[type="text"], select'), function() {
         // Cache original values incase editing is canceled
@@ -5178,7 +5179,7 @@ class Users {
     }
 
     function destroy_user(event) {
-      const id = $(this).attr('data-target') || $(this).attr('data-bs-target');
+      const id = $(this).attr('data-target');
       $("[data-destroy-for='"+id+"']", container).val('1');
     }
 
@@ -5246,7 +5247,7 @@ class Users {
           <auto-complete src="${this.autocomplete_url()}" for="${autocompleteID}-popup" fetch-on-empty>
             <input type="text" name="${autocompleteID}" placeholder="${i18n.t("blocks:autocompleteable:placeholder")}" data-default-typeahead>
             <ul id="${autocompleteID}-popup"></ul>
-            <div id="${autocompleteID}-popup-feedback" class="sr-only visually-hidden"></div>
+            <div id="${autocompleteID}-popup-feedback" class="visually-hidden"></div>
           </auto-complete>
         ` };
       }
@@ -5570,7 +5571,7 @@ Spotlight$1.Block.Resources = (function(){
                         <div class="checkbox">
                           <input name="item[${index}][display]" type="hidden" value="false" />
                           <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                          <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                          <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                         </div>
                         <div class="pic">
                           <img class="img-thumbnail" src="${(data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg")))}" />
@@ -5585,7 +5586,7 @@ Spotlight$1.Block.Resources = (function(){
                       <div>${(data.slug || data.id)}</div>
                       ${this._altTextFieldsHTML(index, data)}
                     </div>
-                    <div class="remove float-right float-end">
+                    <div class="remove float-end">
                       <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                     </div>
                   </div>
@@ -5673,7 +5674,7 @@ Spotlight$1.Block.Resources = (function(){
     altTextHTML: function(index, data) {
       const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
       return `<div class="mt-2 pt-2 d-flex">
-          <div class="me-2 mr-2">
+          <div class="me-2">
             <label class="col-form-label pb-0 pt-1" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
             <div class="form-check mb-1 justify-content-end">
               <input class="form-check-input" type="checkbox"
@@ -5773,7 +5774,7 @@ SirTrevor.Blocks.Browse = (function(){
                     <div class="checkbox">
                       <input name="item[${index}][display]" type="hidden" value="false" />
                       <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                      <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                      <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                     </div>
                     <div class="pic">
                       <img class="img-thumbnail" src="${(data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg")))}" />
@@ -5782,7 +5783,7 @@ SirTrevor.Blocks.Browse = (function(){
                       <div class="title card-title">${(data.full_title || data.title)}</div>
                       <div>${(data.slug || data.id)}</div>
                     </div>
-                    <div class="remove float-right float-end">
+                    <div class="remove float-end">
                       <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                     </div>
                   </div>
@@ -5831,7 +5832,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
       return `<auto-complete src="${this.autocomplete_url()}" for="${autocompleteID}-popup" fetch-on-empty>
         <input type="text" name="${autocompleteID}" placeholder="${i18n.t("blocks:browse_group_categories:autocomplete")}" data-default-typeahead>
         <ul id="${autocompleteID}-popup"></ul>
-        <div id="${autocompleteID}-popup-feedback" class="sr-only visually-hidden"></div>
+        <div id="${autocompleteID}-popup-feedback" class="visually-hidden"></div>
       </auto-complete>`
     },
     autocomplete_template: function(obj) {
@@ -5866,7 +5867,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
                   <div class="checkbox">
                     <input name="item[${index}][display]" type="hidden" value="false" />
                     <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                    <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                    <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                   </div>
                   <div class="main">
                     <div class="title card-title">${data.title}</div>
@@ -6131,10 +6132,10 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
       var iiifFields = [
         '<input type="hidden" name="item[' + index + '][thumbnail_image_url]" value="' + (autocomplete_data.thumbnail_image_url || autocomplete_data.thumbnail || "") + '"/>',
         '<input type="hidden" name="item[' + index + '][full_image_url]" value="' + (autocomplete_data.full_image_url || autocomplete_data.thumbnail_image_url || autocomplete_data.thumbnail || "") + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_tilesource]" value="' + (autocomplete_data.iiif_tilesource) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_manifest_url]" value="' + (autocomplete_data.iiif_manifest_url) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_canvas_id]" value="' + (autocomplete_data.iiif_canvas_id) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_image_id]" value="' + (autocomplete_data.iiif_image_id) + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_tilesource]" value="' + (autocomplete_data.iiif_tilesource || "") + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_manifest_url]" value="' + (autocomplete_data.iiif_manifest_url || "") + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_canvas_id]" value="' + (autocomplete_data.iiif_canvas_id || "") + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_image_id]" value="' + (autocomplete_data.iiif_image_id || "") + '"/>',
       ];
 
       // The region input is required for widgets that enable image cropping but not otherwise
@@ -6301,10 +6302,10 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
       var clickHandler = function (e) {
         var href;
         var $this   = $(this);
-        var $target = $($this.attr('data-target') || $this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7
+        var $target = $($this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7
         if (!$target.hasClass('carousel')) return
         var options = $.extend({}, $target.data(), $this.data());
-        var slideIndex = $this.attr('data-slide-to') || $this.attr('data-bs-slide-to');
+        var slideIndex = $this.attr('data-bs-slide-to');
         if (slideIndex) options.interval = false;
 
         $.fn.carousel.call($target, options);
@@ -6317,8 +6318,8 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
       };
 
       $(this.inner).find('.carousel')
-        .on('click.bs.carousel.data-api', '[data-slide], [data-bs-slide]', clickHandler)
-        .on('click.bs.carousel.data-api', '[data-slide-to], [data-bs-slide-to]', clickHandler);
+        .on('click.bs.carousel.data-api', '[data-bs-slide]', clickHandler)
+        .on('click.bs.carousel.data-api', '[data-bs-slide-to]', clickHandler);
     }
 
   });
@@ -6361,10 +6362,10 @@ SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
       var clickHandler = function (e) {
         var href;
         var $this   = $(this);
-        var $target = $($this.attr('data-target') || $this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7
+        var $target = $($this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7
         if (!$target.hasClass('carousel')) return
         var options = $.extend({}, $target.data(), $this.data());
-        var slideIndex = $this.attr('data-slide-to') || $this.attr('data-bs-slide-to');
+        var slideIndex =$this.attr('data-bs-slide-to');
         if (slideIndex) options.interval = false;
 
         $.fn.carousel.call($target, options);
@@ -6377,8 +6378,7 @@ SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
       };
 
       $(this.inner).find('.carousel')
-        .on('click.bs.carousel.data-api', '[data-slide], [data-bs-slide]', clickHandler)
-        .on('click.bs.carousel.data-api', '[data-slide-to], [data-bs-slide-to]', clickHandler);
+        .on('click.bs.carousel.data-api', '[data-bs-slide-to]', clickHandler);
     }
 
   });
@@ -6481,24 +6481,24 @@ SirTrevor.Blocks.UploadedItems = (function(){
                 <div class="checkbox">
                   <input name="item[${index}][display]" type="hidden" value="false" />
                   <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + dataId)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                  <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + dataId)}">${i18n.t("blocks:resources:panel:display")}</label>
+                  <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + dataId)}">${i18n.t("blocks:resources:panel:display")}</label>
                 </div>
                 <div class="pic">
                   <img class="img-thumbnail" src="${dataUrl}" />
                 </div>
                 <div class="main form-horizontal">
                   <div class="title card-title">${dataTitle}</div>
-                  <div class="field row mr-3 me-3">
+                  <div class="field row me-3">
                     <label for="${this.formId('caption_' + dataId)}" class="col-form-label col-md-3">${i18n.t("blocks:uploaded_items:caption")}</label>
                     <input type="text" class="form-control col" id="${this.formId('caption_' + dataId)}" name="item[${index}][caption]" data-field="caption"/>
                   </div>
-                  <div class="field row mr-3 me-3">
+                  <div class="field row me-3">
                     <label for="${this.formId('link_' + dataId)}" class="col-form-label col-md-3">${i18n.t("blocks:uploaded_items:link")}</label>
                     <input type="text" class="form-control col" id="${this.formId('link_' + dataId)}" name="item[${index}][link]" data-field="link"/>
                   </div>
                   ${this._altTextFieldsHTML(index, data)}
                 </div>
-                <div class="remove float-right float-end">
+                <div class="remove float-end">
                   <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                 </div>
               </div>
@@ -6548,8 +6548,8 @@ SirTrevor.Blocks.UploadedItems = (function(){
     altTextHTML: function(index, data) {
       const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
       return `
-      <div class="field row mr-3 me-3">
-        <div class="col-lg-3 ps-md-2 pl-md-2">
+      <div class="field row me-3">
+        <div class="col-lg-3 ps-md-2">
           <label class="col-form-label text-nowrap pb-0 pt-1 justify-content-md-start justify-content-lg-end d-flex" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
           <div class="form-check d-flex justify-content-md-start justify-content-lg-end">
             <input class="form-check-input" type="checkbox"
@@ -7067,9 +7067,9 @@ class TagSelectorController extends Controller {
               type="button"
               data-action="${this.identifier}#deselect"
               data-tag="${tag}"
-              class="btn-close close ms-1 ml-1"
+              class="btn-close close ms-1"
               aria-label="${this.translationsValue.remove} ${tag}"
-            ><span aria-hidden="true" class="visually-hidden">&times;</span></button>
+            ></button>
           </span>
         </li>
       `