blacklight-spotlight 5.2.4 → 5.3.1

data/app/javascript/spotlight/admin/index.js

@@ -1,56 +1,53 @@
-import AddAnother from 'spotlight/admin/add_another'
-import AddNewButton from 'spotlight/admin/add_new_button'
-import BlacklightConfiguration from 'spotlight/admin/blacklight_configuration'
-import CopyEmailAddress from 'spotlight/admin/copy_email_addresses'
-import Croppable from 'spotlight/admin/croppable'
-import EditInPlace from 'spotlight/admin/edit_in_place'
-import Exhibits from 'spotlight/admin/exhibits'
-import FormObserver from 'spotlight/admin/form_observer'
-import Locks from 'spotlight/admin/locks'
-import 'spotlight/admin/multi_image_selector'
-import Pages from 'spotlight/admin/pages'
-import ProgressMonitor from 'spotlight/admin/progress_monitor'
-import ReadonlyCheckbox from 'spotlight/admin/readonly_checkbox'
-import { addAutocompletetoFeaturedImage } from 'spotlight/admin/search_typeahead'
-import SelectRelatedInput from 'spotlight/admin/select_related_input'
-import SpotlightNestable from 'spotlight/admin/spotlight_nestable'
-import Tabs from 'spotlight/admin/tabs'
-import TranslationProgress from 'spotlight/admin/translation_progress'
-import 'spotlight/admin/visibility_toggle'
-import Users from 'spotlight/admin/users'
+import AddAnother from "spotlight/admin/add_another"
+import AddNewButton from "spotlight/admin/add_new_button"
+import BlacklightConfiguration from "spotlight/admin/blacklight_configuration"
+import Croppable from "spotlight/admin/croppable"
+import EditInPlace from "spotlight/admin/edit_in_place"
+import Exhibits from "spotlight/admin/exhibits"
+import FormObserver from "spotlight/admin/form_observer"
+import Locks from "spotlight/admin/locks"
+import "spotlight/admin/multi_image_selector"
+import Pages from "spotlight/admin/pages"
+import ProgressMonitor from "spotlight/admin/progress_monitor"
+import ReadonlyCheckbox from "spotlight/admin/readonly_checkbox"
+import { addAutocompletetoFeaturedImage } from "spotlight/admin/search_typeahead"
+import SelectRelatedInput from "spotlight/admin/select_related_input"
+import SpotlightNestable from "spotlight/admin/spotlight_nestable"
+import Tabs from "spotlight/admin/tabs"
+import TranslationProgress from "spotlight/admin/translation_progress"
+import "spotlight/admin/visibility_toggle"
+import Users from "spotlight/admin/users"
 
-import 'spotlight/admin/block_mixins/autocompleteable'
-import 'spotlight/admin/block_mixins/formable'
-import 'spotlight/admin/block_mixins/plustextable'
+import "spotlight/admin/block_mixins/autocompleteable"
+import "spotlight/admin/block_mixins/formable"
+import "spotlight/admin/block_mixins/plustextable"
 
-import 'spotlight/admin/blocks/block'
-import 'spotlight/admin/blocks/resources_block' // This is a base class of several other blocks, so must come first
-import 'spotlight/admin/blocks/browse_block'
-import 'spotlight/admin/blocks/browse_group_categories_block'
-import 'spotlight/admin/blocks/iframe_block'
-import 'spotlight/admin/blocks/link_to_search_block'
-import 'spotlight/admin/blocks/oembed_block'
-import 'spotlight/admin/blocks/pages_block'
-import 'spotlight/admin/blocks/rule_block'
-import 'spotlight/admin/blocks/search_result_block'
-import 'spotlight/admin/blocks/solr_documents_base_block'
-import 'spotlight/admin/blocks/solr_documents_block'
-import 'spotlight/admin/blocks/solr_documents_carousel_block'
-import 'spotlight/admin/blocks/solr_documents_embed_block'
-import 'spotlight/admin/blocks/solr_documents_features_block'
-import 'spotlight/admin/blocks/solr_documents_grid_block'
-import 'spotlight/admin/blocks/uploaded_items_block'
-
-import 'spotlight/admin/sir-trevor/block_controls'
-import 'spotlight/admin/sir-trevor/block_limits'
-import 'spotlight/admin/sir-trevor/locales'
+import "spotlight/admin/blocks/block"
+import "spotlight/admin/blocks/resources_block" // This is a base class of several other blocks, so must come first
+import "spotlight/admin/blocks/browse_block"
+import "spotlight/admin/blocks/browse_group_categories_block"
+import "spotlight/admin/blocks/iframe_block"
+import "spotlight/admin/blocks/link_to_search_block"
+import "spotlight/admin/blocks/oembed_block"
+import "spotlight/admin/blocks/pages_block"
+import "spotlight/admin/blocks/rule_block"
+import "spotlight/admin/blocks/search_result_block"
+import "spotlight/admin/blocks/solr_documents_base_block"
+import "spotlight/admin/blocks/solr_documents_block"
+import "spotlight/admin/blocks/solr_documents_carousel_block"
+import "spotlight/admin/blocks/solr_documents_embed_block"
+import "spotlight/admin/blocks/solr_documents_features_block"
+import "spotlight/admin/blocks/solr_documents_grid_block"
+import "spotlight/admin/blocks/uploaded_items_block"
 
+import "spotlight/admin/sir-trevor/block_controls"
+import "spotlight/admin/sir-trevor/block_limits"
+import "spotlight/admin/sir-trevor/locales"
 
 export default class {
   connect() {
     new AddAnother().connect()
     new AddNewButton().connect()
-    new CopyEmailAddress().connect()
     new Croppable().connect()
     new EditInPlace().connect()
     new Exhibits().connect()
@@ -65,6 +62,6 @@ export default class {
     new TranslationProgress().connect()
     new Users().connect()
     addAutocompletetoFeaturedImage()
-    SpotlightNestable.init();
+    SpotlightNestable.init()
   }
-}
+}

data/app/javascript/spotlight/admin/locks.js

@@ -1,22 +1,22 @@
 export default class {
   delete_lock(el) {
-    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content;
-    
+    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content
+
     fetch(el.dataset.lock, {
-      method: 'DELETE',
+      method: "DELETE",
       headers: {
-        'X-CSRF-Token': csrfToken
-      }
-    });
-    
-    el.removeAttribute('data-lock');
+        "X-CSRF-Token": csrfToken,
+      },
+    })
+
+    el.removeAttribute("data-lock")
   }
 
   connect() {
-    document.querySelectorAll('[data-lock]').forEach(element => {
-      element.addEventListener('click', (e) => {
-        this.delete_lock(e.target);
-      });
-    });
+    document.querySelectorAll("[data-lock]").forEach((element) => {
+      element.addEventListener("click", (e) => {
+        this.delete_lock(e.target)
+      })
+    })
   }
-}
+}

data/app/javascript/spotlight/admin/multi_image_selector.js

@@ -1,159 +1,175 @@
 // Module to add multi-image selector to widget panels
 
-(function(){
-  $.fn.multiImageSelector = function(image_versions, clickCallback, activeImageId) {
-    var changeLink          = $("<a href='javascript:;'>Change</a>"),
-        thumbsListContainer = $("<div class='thumbs-list' style='display:none'></div>"),
-        thumbList           = $("<ul></ul>"),
-        panel;
-
-    var imageIds = $.map(image_versions, function(e) { return e['imageId']; });
-
-    return init(this);
+;(function () {
+  $.fn.multiImageSelector = function (
+    image_versions,
+    clickCallback,
+    activeImageId,
+  ) {
+    var changeLink = $("<a href='javascript:;'>Change</a>"),
+      thumbsListContainer = $(
+        "<div class='thumbs-list' style='display:none'></div>",
+      ),
+      thumbList = $("<ul></ul>"),
+      panel
+
+    var imageIds = $.map(image_versions, function (e) {
+      return e["imageId"]
+    })
+
+    return init(this)
 
     function init(el) {
-      panel = el;
+      panel = el
 
-      destroyExistingImageSelector();
-      if(image_versions && image_versions.length > 1) {
-        addChangeLink();
-        addThumbsList();
+      destroyExistingImageSelector()
+      if (image_versions && image_versions.length > 1) {
+        addChangeLink()
+        addThumbsList()
       }
     }
     function addChangeLink() {
-      $('[data-panel-image-pagination]', panel)
-        .html("Image <span data-current-image='true'>" + indexOf(activeImageId) + "</span> of " + image_versions.length)
+      $("[data-panel-image-pagination]", panel)
+        .html(
+          "Image <span data-current-image='true'>" +
+            indexOf(activeImageId) +
+            "</span> of " +
+            image_versions.length,
+        )
         .show()
         .append(" ")
-        .append(changeLink);
-      addChangeLinkBehavior();
+        .append(changeLink)
+      addChangeLinkBehavior()
     }
 
     function destroyExistingImageSelector() {
-      var pagination = $('[data-panel-image-pagination]', panel);
-      pagination.html('');
-      pagination.next('.' + thumbsListContainer.attr('class')).remove();
+      var pagination = $("[data-panel-image-pagination]", panel)
+      pagination.html("")
+      pagination.next("." + thumbsListContainer.attr("class")).remove()
     }
 
-    function indexOf(thumb){
+    function indexOf(thumb) {
       const index = imageIds.indexOf(thumb)
       if (index > -1) {
-        return index + 1;
+        return index + 1
       } else {
-        return 1;
+        return 1
       }
     }
     function addChangeLinkBehavior() {
-      changeLink.on('click', function(){
-        thumbsListContainer.slideToggle();
-        updateThumbListWidth();
-        addScrollBehavior();
-        scrollToActiveThumb();
-        loadVisibleThumbs();
-        swapChangeLinkText($(this));
-      });
+      changeLink.on("click", function () {
+        thumbsListContainer.slideToggle()
+        updateThumbListWidth()
+        addScrollBehavior()
+        scrollToActiveThumb()
+        loadVisibleThumbs()
+        swapChangeLinkText($(this))
+      })
     }
     function updateThumbListWidth() {
-      var width = 0;
-      $('li', thumbList).each(function(){
-        width += $(this).outerWidth();
-      });
-      thumbList.width(width + 5);
+      var width = 0
+      $("li", thumbList).each(function () {
+        width += $(this).outerWidth()
+      })
+      thumbList.width(width + 5)
     }
-    function loadVisibleThumbs(){
-      var viewportWidth = thumbsListContainer.width();
-      var width = 0;
-      $('li', thumbList).each(function(){
-        var thisThumb  = $(this),
-            image      = $('img', thisThumb),
-            totalWidth = width += thisThumb.width(),
-            position   = (thumbList.position().left + totalWidth) - thisThumb.width();
-
-        if(position >= 0 && position < viewportWidth) {
-          image.prop('src', image.data('src'));
+    function loadVisibleThumbs() {
+      var viewportWidth = thumbsListContainer.width()
+      var width = 0
+      $("li", thumbList).each(function () {
+        var thisThumb = $(this),
+          image = $("img", thisThumb),
+          totalWidth = (width += thisThumb.width()),
+          position = thumbList.position().left + totalWidth - thisThumb.width()
+
+        if (position >= 0 && position < viewportWidth) {
+          image.prop("src", image.data("src"))
         }
-      });
+      })
     }
-    function addScrollBehavior(){
-      thumbsListContainer.scrollStop(function(){
-        loadVisibleThumbs();
-      });
+    function addScrollBehavior() {
+      thumbsListContainer.scrollStop(function () {
+        loadVisibleThumbs()
+      })
     }
-    function scrollToActiveThumb(){
-      var halfContainerWidth      = (thumbsListContainer.width() / 2),
-          activeThumbLeftPosition = ($('.active', thumbList).position() || $('li', thumbList).first().position()).left,
-          halfActiveThumbWidth    = ($('.active', thumbList).width() / 2);
+    function scrollToActiveThumb() {
+      var halfContainerWidth = thumbsListContainer.width() / 2,
+        activeThumbLeftPosition = (
+          $(".active", thumbList).position() ||
+          $("li", thumbList).first().position()
+        ).left,
+        halfActiveThumbWidth = $(".active", thumbList).width() / 2
       thumbsListContainer.scrollLeft(
-        (activeThumbLeftPosition - halfContainerWidth) + halfActiveThumbWidth
-      );
+        activeThumbLeftPosition - halfContainerWidth + halfActiveThumbWidth,
+      )
     }
     function addThumbsList() {
-      addThumbsToList();
-      updateActiveThumb();
-      $('.card-header', panel).append(
-        thumbsListContainer.append(
-          thumbList
-        )
-      );
+      addThumbsToList()
+      updateActiveThumb()
+      $(".card-header", panel).append(thumbsListContainer.append(thumbList))
     }
-    function updateActiveThumb(){
-      $('li', thumbList).each(function(){
-        var item = $(this);
-        if($('img', item).data('image-id') == activeImageId){
-          item.addClass('active');
+    function updateActiveThumb() {
+      $("li", thumbList).each(function () {
+        var item = $(this)
+        if ($("img", item).data("image-id") == activeImageId) {
+          item.addClass("active")
         }
-      });
+      })
     }
-    function swapChangeLinkText(link){
-      link.text(
-        link.text() == 'Change' ? 'Close' : 'Change'
-      )
+    function swapChangeLinkText(link) {
+      link.text(link.text() == "Change" ? "Close" : "Change")
     }
 
-    function addThumbsToList(){
-      $.each(image_versions, function(i){
-        var listItem = $('<li data-index="' + i + '"><a href="javascript:;"><img src="' + image_versions[i]['thumb'] +'" data-image-id="' + image_versions[i]['imageId'] +'" /></a></li>');
-        listItem.on('click', function(){
+    function addThumbsToList() {
+      $.each(image_versions, function (i) {
+        var listItem = $(
+          '<li data-index="' +
+            i +
+            '"><a href="javascript:;"><img src="' +
+            image_versions[i]["thumb"] +
+            '" data-image-id="' +
+            image_versions[i]["imageId"] +
+            '" /></a></li>',
+        )
+        listItem.on("click", function () {
           // get the current image id
-          var imageid = $('img', $(this)).data('image-id');
-          var src = $('img', $(this)).attr('src');
+          var src = $("img", $(this)).attr("src")
 
-          if (typeof clickCallback === 'function' ) {
-            clickCallback(image_versions[i]);
+          if (typeof clickCallback === "function") {
+            clickCallback(image_versions[i])
           }
 
           // mark the current selection as active
-          $('li.active', thumbList).removeClass('active');
-          $(this).addClass('active');
+          $("li.active", thumbList).removeClass("active")
+          $(this).addClass("active")
 
           // update the multi-image selector image
-          $(".pic img.img-thumbnail", panel).attr("src", src);
-
-          $('[data-panel-image-pagination] [data-current-image]', panel).text(
-            $('li', thumbList).index($(this)) + 1
-          );
-          scrollToActiveThumb();
-        });
-        $("img", listItem).on('load', function() {
-          updateThumbListWidth();
-        });
-        thumbList.append(listItem);
-      });
+          $(".pic img.img-thumbnail", panel).attr("src", src)
+
+          $("[data-panel-image-pagination] [data-current-image]", panel).text(
+            $("li", thumbList).index($(this)) + 1,
+          )
+          scrollToActiveThumb()
+        })
+        $("img", listItem).on("load", function () {
+          updateThumbListWidth()
+        })
+        thumbList.append(listItem)
+      })
     }
-  };
-
-})(jQuery);
+  }
+})(jQuery)
 
 // source: http://stackoverflow.com/questions/14035083/jquery-bind-event-on-scroll-stops
-jQuery.fn.scrollStop = function(callback) {
-  $(this).scroll(function() {
-    var self  = this,
-    $this = $(self);
+jQuery.fn.scrollStop = function (callback) {
+  $(this).scroll(function () {
+    var self = this,
+      $this = $(self)
 
-    if ($this.data('scrollTimeout')) {
-      clearTimeout($this.data('scrollTimeout'));
+    if ($this.data("scrollTimeout")) {
+      clearTimeout($this.data("scrollTimeout"))
     }
 
-    $this.data('scrollTimeout', setTimeout(callback, 250, self));
-  });
-};
+    $this.data("scrollTimeout", setTimeout(callback, 250, self))
+  })
+}

data/app/javascript/spotlight/admin/pages.js

@@ -1,43 +1,43 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
-import Core from 'spotlight/core'
+import Core from "spotlight/core"
 
 export default class {
-  connect(){
+  connect() {
     SirTrevor.setDefaults({
       iconUrl: Spotlight.sirTrevorIcon,
-      uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
+      uploadUrl: $("[data-attachment-endpoint]").data("attachment-endpoint"),
       ajaxOptions: {
         headers: {
-          'X-CSRF-Token': Core.csrfToken() || ''
+          "X-CSRF-Token": Core.csrfToken() || "",
         },
-        credentials: 'same-origin'
-      }
-    });
+        credentials: "same-origin",
+      },
+    })
 
-    SirTrevor.Blocks.Heading.prototype.toolbarEnabled = true;
-    SirTrevor.Blocks.Quote.prototype.toolbarEnabled = true;
-    SirTrevor.Blocks.Text.prototype.toolbarEnabled = true;
+    SirTrevor.Blocks.Heading.prototype.toolbarEnabled = true
+    SirTrevor.Blocks.Quote.prototype.toolbarEnabled = true
+    SirTrevor.Blocks.Text.prototype.toolbarEnabled = true
 
-    var instance = $('.js-st-instance').first();
+    var instance = $(".js-st-instance").first()
 
     if (instance.length) {
       var editor = new SirTrevor.Editor({
         el: instance[0],
-        blockTypes: instance.data('blockTypes'),
-        altTextSettings: instance.data('altTextSettings'),
-        defaultType:["Text"],
-        onEditorRender: function() {
-          $.SerializedForm();
+        blockTypes: instance.data("blockTypes"),
+        altTextSettings: instance.data("altTextSettings"),
+        defaultType: ["Text"],
+        onEditorRender: function () {
+          $.SerializedForm()
         },
         blockTypeLimits: {
-          "SearchResults": 1
-        }
-      });
+          SearchResults: 1,
+        },
+      })
 
-      editor.blockControls = Core.BlockControls.create(editor);
+      editor.blockControls = Core.BlockControls.create(editor)
 
-      new Core.BlockLimits(editor).enforceLimits(editor);
+      new Core.BlockLimits(editor).enforceLimits(editor)
     }
   }
 }