blacklight-spotlight 3.6.0.beta4 → 3.6.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a68848d6cb11134eb85ef1a9b8616f4acb83f4353e5613c8cf1bbd058de7add
-  data.tar.gz: be2549ff6ad388a7c5c5b9a8acad54a24430babe839a4a73f234557fad4f9114
+  metadata.gz: 6ab068b29098e5b106e7b1727c62405eb25134e37c8822cb6507f1d19225ea18
+  data.tar.gz: 4233be77f493a45b868422c3f96acc03242b975670496121630170352000c073
 SHA512:
-  metadata.gz: f81137f0e27c95ef10a5c8920c884bebc369cb4dde32ad1d20a01f4ddc0ad476395ab5130e5e0111d05bf24fd7b537d8ef6000ae37bc089802a9c7f0cf02f285
-  data.tar.gz: 96d36d39f3f95522daafa50dab5e5737d6e65018bea0bce89848412c4a4948b58127f1100b6d938ef3338b7b3edf6a1ab98189c09c8bdbc46662717b442554ed
+  metadata.gz: 81f74cb5d502e8b0a190b7dd89853a2a545b49d7a2611985bb679868325f2a2a9e7bfb70021d62506cb9d4cb761a2fc11f1a6d971b7e714501121bf9e665f274
+  data.tar.gz: 1aaacfd669052479884ccedf9ca0758d527bfda03c8587c106172c0b68def1d04bd456c7059041f1cf36426ebe2bd49c02eb3fe2b5247b091784c52aa30070ac

data/app/assets/config/spotlight/manifest.js

@@ -1 +1,3 @@
-//= link spotlight/blocks/sir-trevor-icons.svg
+//= link_tree ../../images
+//= link_tree ../../../javascript .js
+//= link_tree ../../../../vendor/assets/javascripts .js

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

@@ -2,7 +2,6 @@
 //= require leaflet
 //= require sir-trevor
 //= require clipboard
-//= require handlebars
 //= require tiny-slider
 //= require typeahead.bundle.min.js
 

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

@@ -5093,7 +5093,7 @@ jQuery.fn.scrollStop = function(callback) {
 class Pages {
   connect(){
     SirTrevor.setDefaults({
-      iconUrl: Spotlight$1.sirTrevorIcon,
+      iconUrl: Spotlight.sirTrevorIcon,
       uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
       ajaxOptions: {
         headers: {
@@ -5297,12 +5297,11 @@ class ReadonlyCheckbox {
         hint: (typeAheadInput.data('autocomplete-hint') || false),
         autoselect: (typeAheadInput.data('autocomplete-autoselect') || true)
       }, options);
-
       typeAheadInput.typeahead(settings, {
         displayKey: settings.displayKey,
         source: settings.bloodhound.ttAdapter(),
         templates: {
-          suggestion: Handlebars.compile(settings.template)
+          suggestion: settings.template
         }
       });
     }
@@ -5329,13 +5328,15 @@ function itemsBloodhound() {
   results.initialize();
   return results;
 }
-function itemsTemplate() {
-  return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>';
+function templateFunc(obj) {
+  const thumbnail = obj.thumbnail ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail}" /></div>` : '';
+  return $(`<div class="autocomplete-item${obj.private ? ' blacklight-private' : ''}">${thumbnail}
+  <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`)
 }
 
 function addAutocompletetoFeaturedImage(){
   if($('[data-featured-image-typeahead]').length > 0) {
-    $('[data-featured-image-typeahead]').spotlightSearchTypeAhead({bloodhound: itemsBloodhound(), template: itemsTemplate()}).on('click', function() {
+    $('[data-featured-image-typeahead]').spotlightSearchTypeAhead({bloodhound: itemsBloodhound(), template: templateFunc}).on('click', function() {
       $(this).select();
     }).on('typeahead:selected typeahead:autocompleted', function(e, data) {
       var panel = $($(this).data('target-panel'));
@@ -5654,10 +5655,6 @@ class Users {
         this.autocomplete_url = function() { return $('form[data-autocomplete-url]').data('autocomplete-url').replace("%25QUERY", "%QUERY"); };
       }
 
-      if (this['autocomplete_template'] === undefined) {
-        this.autocomplete_url = function() { return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' };
-      }
-
       if (this['transform_autocomplete_results'] === undefined) {
         this.transform_autocomplete_results = (val) => val;
       }
@@ -5679,7 +5676,7 @@ class Users {
     },
 
     addAutocompletetoSirTrevorForm: function() {
-      $('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template()}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
+      $('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
         if($(this).val() === '') {
           $(this).data().ttTypeahead.input.trigger('queryChanged', '');
         }
@@ -6033,7 +6030,12 @@ SirTrevor.Blocks.Browse = (function(){
     autocomplete_url: function() {
       return $(this.inner).closest('form[data-autocomplete-exhibit-searches-path]').data('autocomplete-exhibit-searches-path').replace("%25QUERY", "%QUERY");
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{full_title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail_image_url ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail_image_url}" /></div>` : '';
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.full_title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
 
     bloodhoundOptions: function() {
       return {
@@ -6135,7 +6137,11 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
     autocomplete_control: function() {
       return `<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="${i18n.t("blocks:browse_group_categories:autocomplete")}"/>`
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}"><span class="autocomplete-title">{{title}}</span><br/></div>' },
+    autocomplete_template: function(obj) {
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">
+      <span class="autocomplete-title">${obj.title}</span><br/></div>`
+    },
+
     autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-browse-groups-path]').data('autocomplete-exhibit-browse-groups-path').replace("%25QUERY", "%QUERY"); },
     _itemPanel: function(data) {
       var index = "item_" + this.globalIndex++;
@@ -6291,7 +6297,11 @@ SirTrevor.Blocks.FeaturedPages = (function(){
     icon_name: "pages",
 
     autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-pages-path]').data('autocomplete-exhibit-pages-path').replace("%25QUERY", "%QUERY"); },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail_image_url ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail_image_url}" /></div>` : '';
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
     bloodhoundOptions: function() {
       return {
         prefetch: {
@@ -6376,8 +6386,11 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
   return Spotlight$1.Block.Resources.extend({
     plustextable: true,
     autocomplete_url: function() { return this.$instance().closest('form[data-autocomplete-exhibit-catalog-path]').data('autocomplete-exhibit-catalog-path').replace("%25QUERY", "%QUERY"); },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
-
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail}" /></div>` : '';
+      return `<div class="autocomplete-item${obj.private ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
     transform_autocomplete_results: function(response) {
       return $.map(response['docs'], function(doc) {
         return doc;
@@ -7100,7 +7113,7 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
   }
 });
 
-// import '../../../../vendor/assets/javascripts/sir-trevor'
+// These scripts are in the vendor directory
 
 
 class AdminIndex {