blacklight-spotlight 4.3.6 → 4.5.0

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

@@ -64,10 +64,10 @@
   class ClearFormButton {
     connect() {
       var $clearBtn = $('.btn-reset');
-      var $input = $clearBtn.parent().prev('input');
+      var $input = $clearBtn.prev('#browse_q');
       var btnCheck = function(){
         if ($input.val() !== '') {
-          $clearBtn.css('display', 'inline-block');
+          $clearBtn.css('display', 'block');
         } else {
           $clearBtn.css('display', 'none');
         }
@@ -5166,6 +5166,7 @@
         var editor = new SirTrevor.Editor({
           el: instance[0],
           blockTypes: instance.data('blockTypes'),
+          altTextSettings: instance.data('altTextSettings'),
           defaultType:["Text"],
           onEditorRender: function() {
             $.SerializedForm();
@@ -5615,7 +5616,7 @@
     if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
       const form = e.target.closest('form');
       if (form) {
-        new CheckboxSubmit(form).clicked(e);
+        if (!Blacklight.BookmarkToggle) new CheckboxSubmit(form).clicked(e);
 
         // Add/remove the "private" label to the document row when visibility is toggled
         const docRow = form.closest('tr');
@@ -5936,18 +5937,16 @@
       formable: true,
       autocompleteable: true,
       show_heading: true,
-      show_alt_text: true,
-
       title: function() { return i18n.t("blocks:" + this.type + ":title"); },
       description: function() { return i18n.t("blocks:" + this.type + ":description"); },
-      alt_text_guidelines: function() { 
-        if (this.show_alt_text) {
+      alt_text_guidelines: function() {
+        if (this.showAltText()) {
           return i18n.t("blocks:alt_text_guidelines:intro"); 
         }
         return "";
       },
       alt_text_guidelines_link: function() {
-        if (this.show_alt_text) {
+        if (this.showAltText()) {
           var link_url = i18n.t("blocks:alt_text_guidelines:link_url");
           var link_label = i18n.t("blocks:alt_text_guidelines:link_label");
           return '<a target="_blank" href="' + link_url + '">' +  link_label + '</a>'; 
@@ -5973,12 +5972,23 @@
       },
 
       _altTextFieldsHTML: function(index, data) {
-        if (this.show_alt_text) {
+        if (this.showAltText()) {
           return this.altTextHTML(index, data);
         }
         return "";
       },
 
+      showAltText: function() {
+        return this.editorOptions.altTextSettings[this._typeAsCamelCase()]
+      },
+
+      _typeAsCamelCase: function() {
+        return this.type
+            .split('_')
+            .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+            .join('');
+      },
+
       _itemPanel: function(data) {
         var index = "item_" + this.globalIndex++;
         var checked;
@@ -6116,7 +6126,7 @@
       },
 
       attachAltTextHandlers: function(panel) {
-        if (this.show_alt_text) {
+        if (this.showAltText()) {
           const decorativeCheckbox = $('input[name$="[decorative]"]', panel);
           const altTextInput = $('textarea[name$="[alt_text]"]', panel);
           const altTextBackupInput = $('input[name$="[alt_text_backup]"]', panel);
@@ -6764,7 +6774,6 @@
 
     return SirTrevor.Blocks.SolrDocumentsBase.extend({
       type: "solr_documents_embed",
-      show_alt_text: false,
       icon_name: "item_embed",
 
       item_options: function() { return "" },