spotlight-frontend 5.1.0 → 5.2.2

package/app/assets/javascripts/spotlight/spotlight.js

@@ -3266,7 +3266,37 @@
   class Carousel {
     connect() {
       if ($.fn.carousel) {
-        $('.carousel').carousel();
+        const $carousel = $('.carousel');
+
+        // updates the aria-describedby on the next and prev btns
+        const updateAriaDescribedBy = function ($carousel) {
+          const $activeItem = $carousel.find('.carousel-item.active');
+          const $items = $carousel.find('.carousel-item');
+          const curIndex = $items.index($activeItem);
+          const prevIndex = (curIndex - 1 + $items.length) % $items.length;
+          const nextIndex = (curIndex + 1) % $items.length;
+
+          const prevDataId = $items.eq(prevIndex).data('id');
+          const nextDataId = $items.eq(nextIndex).data('id');
+          if (prevDataId) {
+            $carousel.find('.carousel-control-prev').attr('aria-describedby', 'carousel-caption-' + prevDataId);
+          }
+          if (nextDataId) {
+            $carousel.find('.carousel-control-next').attr('aria-describedby', 'carousel-caption-' + nextDataId);
+          }
+        };
+
+        // on initial page load, set the aria-describedby on the btns for each carousel
+        $carousel.each(function () {
+          const $this = $(this);
+          $this.carousel();
+          updateAriaDescribedBy($this);
+        });
+
+        // on slide change
+        $carousel.on('slid.bs.carousel', function () {
+          updateAriaDescribedBy($(this));
+        });
       }
     }
   }
@@ -3925,7 +3955,7 @@
         url: url,  //Server script to process data
         type: 'POST',
         success: (data, stat, xhr) => this.successHandler(data, stat, xhr),
-        // error: errorHandler,
+        error: (xhr, stat, error) => this.errorHandler(xhr, stat, error),
         // Form data
         data: this.getData(),
         headers: {
@@ -3941,6 +3971,39 @@
     successHandler(data, stat, xhr) {
       this.setIiifFields({ tilesource: data.tilesource });
       this.setUploadId(data.id);
+      this.clearUploadErrors();
+    }
+
+    errorHandler(xhr, stat, error) {
+      let errorMessage = "Upload failed";
+      if (xhr.responseJSON) {
+        if (xhr.responseJSON.errors) {
+          errorMessage = xhr.responseJSON.errors.join(', ');
+        } else if (xhr.responseJSON.error) {
+          errorMessage = xhr.responseJSON.error;
+        }
+      }
+      this.showUploadError(errorMessage);
+    }
+
+    getUploadErrorsElement() {
+      return this.cropTool.find(".featured-image.invalid-feedback")
+    }
+
+    showUploadError(errorMessage) {
+      const errorsElement = this.getUploadErrorsElement();
+      if (errorsElement) {
+        errorsElement.text(errorMessage).show();
+      } else {
+        console.error("uploadFile", error, errorMessage);
+      }
+    }
+
+    clearUploadErrors() {
+      const errorsElement = this.getUploadErrorsElement();
+      if (errorsElement) {
+        errorsElement.text("").hide();
+      }
     }
 
     setUploadId(id) {
@@ -5999,6 +6062,8 @@
 
       icon_name: "pages",
 
+      show_image_selection: false,
+
       autocomplete_url: function() { return document.getElementById(this.instanceID).closest('form[data-autocomplete-exhibit-pages-path]').dataset.autocompleteExhibitPagesPath; },
       autocomplete_fetch: function(url) {
         return this.fetchOnceAndFilterLocalResults(url);
@@ -6037,8 +6102,6 @@
     });
   })();
 
-  //= require spotlight/admin/blocks/browse_block
-
   SirTrevor.Blocks.SearchResults =  (function(){
 
     return SirTrevor.Blocks.Browse.extend({
@@ -6199,8 +6262,6 @@
 
   })();
 
-  //= require spotlight/admin/blocks/solr_documents_base_block
-
   SirTrevor.Blocks.SolrDocuments = (function(){
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({
@@ -6225,8 +6286,6 @@
 
   })();
 
-  //= require spotlight/admin/blocks/solr_documents_base_block
-
   SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({
@@ -6326,8 +6385,6 @@
 
   })();
 
-  //= require spotlight/admin/blocks/solr_documents_base_block
-
   SirTrevor.Blocks.SolrDocumentsEmbed = (function(){
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({
@@ -6344,8 +6401,6 @@
 
   })();
 
-  //= require spotlight/admin/blocks/solr_documents_base_block
-
   SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({
@@ -6385,8 +6440,6 @@
 
   })();
 
-  //= require spotlight/admin/blocks/solr_documents_base_block
-
   SirTrevor.Blocks.SolrDocumentsGrid = (function(){
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({