blacklight-spotlight 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc52e049da8686762d5f9755ab41238d51106834ba849e0bac4b2fcce07d73f
-  data.tar.gz: 960be72555edc6d08de8bfb7dd0085cec5a8ae4d89766743c4925829278cf7d2
+  metadata.gz: 32f18f140c36b39b7bca19c58d24166cddfaf1207a96463b4e9056717f5d4bc2
+  data.tar.gz: 9bc8343e689f3bbb28e31d88717f695de88d276ff9a8209a4cf8a3258758d39b
 SHA512:
-  metadata.gz: 724d3939b9780ec47eb616ed580e8e832c8d01192113c7d20321af85237704bd04f7aea9fab1594d4941fd067337d451cedb940c244797702e52a27e87b357de
-  data.tar.gz: d1f469073ca74df4352dad644938894a2260eef5f8a3980c26c5fa01b04c49569eff108294bcef1ae33bbdb6a9788e8b5423eef66ebad3ad60c5a49f561dcd4b
+  metadata.gz: ec713d378bff4ea14fb1abb60469a3306bb57195b1eaace499830e7f70714f5d8119b0e45377970615bb633184ca9a2cda883f3b65374b0a39702cb653c1015c
+  data.tar.gz: b63cb0138dc8117ce84f19b59d074854cb74b5220551f6097b5050ccb1794c288d0f7e60ecec06228a9918c78e70cbac7916c0eda8d0cf18996a42adc85d1815

data/README.md

@@ -114,16 +114,24 @@ See [developer-facing instructions for enabling translation](https://github.com/
   - [Blacklight Development Google group](https://groups.google.com/forum/#!forum/blacklight-development)
   - [Spotlight Community Group](https://groups.google.com/forum/#!forum/spotlight-community) (equivalent to #spotlight-service)
 
-
-## Building the javascript
-The javascript is built by npm from sources in `app/javascript` into a bundle
+## Updating the JavaScript bundle
+The JavaScript is built by npm from sources in `app/javascript` into a bundle
 in `app/assets/javascripts/spotlight/spotlight.js`. This file should not be edited
-by hand as any changes would be overwritten.  When any of the javascript
+by hand as any changes would be overwritten.  When any of the JavaScript
 components in the gem are changed, this bundle should be rebuilt with the
 following steps:
 1. [Install npm](https://www.npmjs.com/get-npm)
-2. run `npm install` to download dependencies
-3. make sure that the version in `package.json` matches your intended release version
-4. commit the new `package-lock.json` that reflects the desired version number
-6. run `npm run prepare` to build the bundle
-6. run `npm publish` to push the javascript package to https://npmjs.org/package/spotlight-frontend
+2. Run `npm install` to download dependencies
+3. Run `npm run prepare` to build the bundle
+4. If you are releasing a new version of the gem, follow the release instructions below.
+
+## Releasing a new version and publishing the JavaScript
+You only need to update `package.json` and prepare/publish the JavaScript package for npm if there are changes to the JavaScript.
+1. Edit `version.rb` and `package.json` to set the new version
+2. Run `npm run prepare` to build the JavaScript bundle
+3. Run `npm i --package-lock-only` to update the version in `package-lock.json`
+4. Commit the changes e.g. `git commit -am "Bump version to X.X.X"`
+5. Push the release to rubygems and GitHub: `bundle exec rake release`
+6. Run `npm publish` to push the JavaScript package to https://npmjs.org/package/spotlight-frontend
+
+See "Updating the JavaScript bundle" above for more details.

data/Rakefile

@@ -78,10 +78,10 @@ namespace :spotlight do
 
       Dir.mktmpdir do |dir|
         Dir.chdir(dir) do
-          Bundler.with_clean_env do
+          Bundler.with_unbundled_env do
             version = "_#{Gem.loaded_specs['rails'].version}_" if Gem.loaded_specs['rails']
 
-            Bundler.with_clean_env do
+            Bundler.with_unbundled_env do
               IO.popen({ 'SPOTLIGHT_GEM' => File.dirname(__FILE__) },
                        ['rails', version, 'new', 'internal', '--skip-spring', '-m', template_path] +
                           [err: %i[child out]]) do |io|
@@ -93,7 +93,7 @@ namespace :spotlight do
               end
             end
 
-            Bundler.with_clean_env do
+            Bundler.with_unbundled_env do
               Dir.chdir('internal') do
                 APP_ROOT = Dir.pwd
                 SolrWrapper.wrap(port: '8983') do |solr|

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

@@ -809,102 +809,6 @@ class UserIndex {
 
 })(window.jQuery || window.Zepto, window, document);
 
-/*
-https://gist.github.com/pjambet/3710461
-*/
-var LATIN_MAP = {
-  'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç':
-  'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I',
-  'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö':
-  'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U',
-  'Ý': 'Y', 'Þ': 'TH', 'ß': 'ss', 'à':'a', 'á':'a', 'â': 'a', 'ã': 'a', 'ä':
-  'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e',
-  'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó':
-  'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u',
-  'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
-};
-var LATIN_SYMBOLS_MAP = {
-  '©':'(c)'
-};
-var GREEK_MAP = {
-  'α':'a', 'β':'b', 'γ':'g', 'δ':'d', 'ε':'e', 'ζ':'z', 'η':'h', 'θ':'8',
-  'ι':'i', 'κ':'k', 'λ':'l', 'μ':'m', 'ν':'n', 'ξ':'3', 'ο':'o', 'π':'p',
-  'ρ':'r', 'σ':'s', 'τ':'t', 'υ':'y', 'φ':'f', 'χ':'x', 'ψ':'ps', 'ω':'w',
-  'ά':'a', 'έ':'e', 'ί':'i', 'ό':'o', 'ύ':'y', 'ή':'h', 'ώ':'w', 'ς':'s',
-  'ϊ':'i', 'ΰ':'y', 'ϋ':'y', 'ΐ':'i',
-  'Α':'A', 'Β':'B', 'Γ':'G', 'Δ':'D', 'Ε':'E', 'Ζ':'Z', 'Η':'H', 'Θ':'8',
-  'Ι':'I', 'Κ':'K', 'Λ':'L', 'Μ':'M', 'Ν':'N', 'Ξ':'3', 'Ο':'O', 'Π':'P',
-  'Ρ':'R', 'Σ':'S', 'Τ':'T', 'Υ':'Y', 'Φ':'F', 'Χ':'X', 'Ψ':'PS', 'Ω':'W',
-  'Ά':'A', 'Έ':'E', 'Ί':'I', 'Ό':'O', 'Ύ':'Y', 'Ή':'H', 'Ώ':'W', 'Ϊ':'I',
-  'Ϋ':'Y'
-};
-var TURKISH_MAP = {
-  'ş':'s', 'Ş':'S', 'ı':'i', 'İ':'I', 'ç':'c', 'Ç':'C', 'ü':'u', 'Ü':'U',
-  'ö':'o', 'Ö':'O', 'ğ':'g', 'Ğ':'G'
-};
-var RUSSIAN_MAP = {
-  'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh',
-  'з':'z', 'и':'i', 'й':'j', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o',
-  'п':'p', 'р':'r', 'с':'s', 'т':'t', 'у':'u', 'ф':'f', 'х':'h', 'ц':'c',
-  'ч':'ch', 'ш':'sh', 'щ':'sh', 'ъ':'', 'ы':'y', 'ь':'', 'э':'e', 'ю':'yu',
-  'я':'ya',
-  'А':'A', 'Б':'B', 'В':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ё':'Yo', 'Ж':'Zh',
-  'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'М':'M', 'Н':'N', 'О':'O',
-  'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'C',
-  'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sh', 'Ъ':'', 'Ы':'Y', 'Ь':'', 'Э':'E', 'Ю':'Yu',
-  'Я':'Ya'
-};
-var UKRAINIAN_MAP = {
-  'Є':'Ye', 'І':'I', 'Ї':'Yi', 'Ґ':'G', 'є':'ye', 'і':'i', 'ї':'yi', 'ґ':'g'
-};
-var CZECH_MAP = {
-  'č':'c', 'ď':'d', 'ě':'e', 'ň': 'n', 'ř':'r', 'š':'s', 'ť':'t', 'ů':'u',
-  'ž':'z', 'Č':'C', 'Ď':'D', 'Ě':'E', 'Ň': 'N', 'Ř':'R', 'Š':'S', 'Ť':'T',
-  'Ů':'U', 'Ž':'Z'
-};
-
-var POLISH_MAP = {
-  'ą':'a', 'ć':'c', 'ę':'e', 'ł':'l', 'ń':'n', 'ó':'o', 'ś':'s', 'ź':'z',
-  'ż':'z', 'Ą':'A', 'Ć':'C', 'Ę':'e', 'Ł':'L', 'Ń':'N', 'Ó':'o', 'Ś':'S',
-  'Ź':'Z', 'Ż':'Z'
-};
-
-var LATVIAN_MAP = {
-  'ā':'a', 'č':'c', 'ē':'e', 'ģ':'g', 'ī':'i', 'ķ':'k', 'ļ':'l', 'ņ':'n',
-  'š':'s', 'ū':'u', 'ž':'z', 'Ā':'A', 'Č':'C', 'Ē':'E', 'Ģ':'G', 'Ī':'i',
-  'Ķ':'k', 'Ļ':'L', 'Ņ':'N', 'Š':'S', 'Ū':'u', 'Ž':'Z'
-};
-
-var ALL_DOWNCODE_MAPS=new Array();
-ALL_DOWNCODE_MAPS[0]=LATIN_MAP;
-ALL_DOWNCODE_MAPS[1]=LATIN_SYMBOLS_MAP;
-ALL_DOWNCODE_MAPS[2]=GREEK_MAP;
-ALL_DOWNCODE_MAPS[3]=TURKISH_MAP;
-ALL_DOWNCODE_MAPS[4]=RUSSIAN_MAP;
-ALL_DOWNCODE_MAPS[5]=UKRAINIAN_MAP;
-ALL_DOWNCODE_MAPS[6]=CZECH_MAP;
-ALL_DOWNCODE_MAPS[7]=POLISH_MAP;
-ALL_DOWNCODE_MAPS[8]=LATVIAN_MAP;
-
-var Downcoder = new Object();
-Downcoder.Initialize = function()
-{
-  if (Downcoder.map) // already made
-    return ;
-    Downcoder.map ={};
-    Downcoder.chars = '' ;
-    for(var i in ALL_DOWNCODE_MAPS)
-    {
-      var lookup = ALL_DOWNCODE_MAPS[i];
-      for (var c in lookup)
-      {
-        Downcoder.map[c] = lookup[c] ;
-        Downcoder.chars += c ;
-      }
-    }
-    Downcoder.regex = new RegExp('[' + Downcoder.chars + ']|[^' + Downcoder.chars + ']+','g') ;
-  };
-
 /* From https://github.com/TimSchlechter/bootstrap-tagsinput/blob/2661784c2c281d3a69b93897ff3f39e4ffa5cbd1/dist/bootstrap-tagsinput.js */
 
 /* The MIT License (MIT)
@@ -4768,6 +4672,144 @@ class ExhibitTagAutocomplete {
   }
 }
 
+/*
+https://gist.github.com/pjambet/3710461
+*/
+var LATIN_MAP = {
+  'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç':
+  'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I',
+  'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö':
+  'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U',
+  'Ý': 'Y', 'Þ': 'TH', 'ß': 'ss', 'à':'a', 'á':'a', 'â': 'a', 'ã': 'a', 'ä':
+  'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e',
+  'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó':
+  'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u',
+  'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
+};
+var LATIN_SYMBOLS_MAP = {
+  '©':'(c)'
+};
+var GREEK_MAP = {
+  'α':'a', 'β':'b', 'γ':'g', 'δ':'d', 'ε':'e', 'ζ':'z', 'η':'h', 'θ':'8',
+  'ι':'i', 'κ':'k', 'λ':'l', 'μ':'m', 'ν':'n', 'ξ':'3', 'ο':'o', 'π':'p',
+  'ρ':'r', 'σ':'s', 'τ':'t', 'υ':'y', 'φ':'f', 'χ':'x', 'ψ':'ps', 'ω':'w',
+  'ά':'a', 'έ':'e', 'ί':'i', 'ό':'o', 'ύ':'y', 'ή':'h', 'ώ':'w', 'ς':'s',
+  'ϊ':'i', 'ΰ':'y', 'ϋ':'y', 'ΐ':'i',
+  'Α':'A', 'Β':'B', 'Γ':'G', 'Δ':'D', 'Ε':'E', 'Ζ':'Z', 'Η':'H', 'Θ':'8',
+  'Ι':'I', 'Κ':'K', 'Λ':'L', 'Μ':'M', 'Ν':'N', 'Ξ':'3', 'Ο':'O', 'Π':'P',
+  'Ρ':'R', 'Σ':'S', 'Τ':'T', 'Υ':'Y', 'Φ':'F', 'Χ':'X', 'Ψ':'PS', 'Ω':'W',
+  'Ά':'A', 'Έ':'E', 'Ί':'I', 'Ό':'O', 'Ύ':'Y', 'Ή':'H', 'Ώ':'W', 'Ϊ':'I',
+  'Ϋ':'Y'
+};
+var TURKISH_MAP = {
+  'ş':'s', 'Ş':'S', 'ı':'i', 'İ':'I', 'ç':'c', 'Ç':'C', 'ü':'u', 'Ü':'U',
+  'ö':'o', 'Ö':'O', 'ğ':'g', 'Ğ':'G'
+};
+var RUSSIAN_MAP = {
+  'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh',
+  'з':'z', 'и':'i', 'й':'j', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o',
+  'п':'p', 'р':'r', 'с':'s', 'т':'t', 'у':'u', 'ф':'f', 'х':'h', 'ц':'c',
+  'ч':'ch', 'ш':'sh', 'щ':'sh', 'ъ':'', 'ы':'y', 'ь':'', 'э':'e', 'ю':'yu',
+  'я':'ya',
+  'А':'A', 'Б':'B', 'В':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ё':'Yo', 'Ж':'Zh',
+  'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'М':'M', 'Н':'N', 'О':'O',
+  'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'C',
+  'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sh', 'Ъ':'', 'Ы':'Y', 'Ь':'', 'Э':'E', 'Ю':'Yu',
+  'Я':'Ya'
+};
+var UKRAINIAN_MAP = {
+  'Є':'Ye', 'І':'I', 'Ї':'Yi', 'Ґ':'G', 'є':'ye', 'і':'i', 'ї':'yi', 'ґ':'g'
+};
+var CZECH_MAP = {
+  'č':'c', 'ď':'d', 'ě':'e', 'ň': 'n', 'ř':'r', 'š':'s', 'ť':'t', 'ů':'u',
+  'ž':'z', 'Č':'C', 'Ď':'D', 'Ě':'E', 'Ň': 'N', 'Ř':'R', 'Š':'S', 'Ť':'T',
+  'Ů':'U', 'Ž':'Z'
+};
+
+var POLISH_MAP = {
+  'ą':'a', 'ć':'c', 'ę':'e', 'ł':'l', 'ń':'n', 'ó':'o', 'ś':'s', 'ź':'z',
+  'ż':'z', 'Ą':'A', 'Ć':'C', 'Ę':'e', 'Ł':'L', 'Ń':'N', 'Ó':'o', 'Ś':'S',
+  'Ź':'Z', 'Ż':'Z'
+};
+
+var LATVIAN_MAP = {
+  'ā':'a', 'č':'c', 'ē':'e', 'ģ':'g', 'ī':'i', 'ķ':'k', 'ļ':'l', 'ņ':'n',
+  'š':'s', 'ū':'u', 'ž':'z', 'Ā':'A', 'Č':'C', 'Ē':'E', 'Ģ':'G', 'Ī':'i',
+  'Ķ':'k', 'Ļ':'L', 'Ņ':'N', 'Š':'S', 'Ū':'u', 'Ž':'Z'
+};
+
+var ALL_DOWNCODE_MAPS=new Array();
+ALL_DOWNCODE_MAPS[0]=LATIN_MAP;
+ALL_DOWNCODE_MAPS[1]=LATIN_SYMBOLS_MAP;
+ALL_DOWNCODE_MAPS[2]=GREEK_MAP;
+ALL_DOWNCODE_MAPS[3]=TURKISH_MAP;
+ALL_DOWNCODE_MAPS[4]=RUSSIAN_MAP;
+ALL_DOWNCODE_MAPS[5]=UKRAINIAN_MAP;
+ALL_DOWNCODE_MAPS[6]=CZECH_MAP;
+ALL_DOWNCODE_MAPS[7]=POLISH_MAP;
+ALL_DOWNCODE_MAPS[8]=LATVIAN_MAP;
+
+var Downcoder = new Object();
+Downcoder.Initialize = function()
+{
+  if (Downcoder.map) // already made
+    return ;
+    Downcoder.map ={};
+    Downcoder.chars = '' ;
+    for(var i in ALL_DOWNCODE_MAPS)
+    {
+      var lookup = ALL_DOWNCODE_MAPS[i];
+      for (var c in lookup)
+      {
+        Downcoder.map[c] = lookup[c] ;
+        Downcoder.chars += c ;
+      }
+    }
+    Downcoder.regex = new RegExp('[' + Downcoder.chars + ']|[^' + Downcoder.chars + ']+','g') ;
+  };
+  
+const downcode = function( slug )
+{
+  Downcoder.Initialize() ;
+  var downcoded ="";
+  var pieces = slug.match(Downcoder.regex);
+  if(pieces)
+  {
+    for (var i = 0 ; i < pieces.length ; i++)
+    {
+      if (pieces[i].length == 1)
+      {
+        var mapped = Downcoder.map[pieces[i]] ;
+        if (mapped != null)
+        {
+          downcoded+=mapped;
+          continue ;
+        }
+      }
+      downcoded+=pieces[i];
+    }
+  }
+  else
+  {
+    downcoded = slug;
+  }
+  return downcoded;
+};
+
+
+function URLify(s, num_chars) {
+  // changes, e.g., "Petty theft" to "petty_theft"
+  // remove all these words from the string before urlifying
+  s = downcode(s);
+  //
+  // if downcode doesn't hit, the char will be stripped here
+  s = s.replace(/[^-\w\s]/g, ' ');  // remove unneeded chars
+  s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
+  s = s.replace(/[-\s]+/g, '-');   // convert spaces to hyphens
+  s = s.toLowerCase();             // convert to lowercase
+  return s.substring(0, num_chars);// trim to first num_chars chars
+}
+
 class Exhibits {
   connect() {
     // auto-fill the exhibit slug on the new exhibit form
@@ -4828,7 +4870,7 @@ class Exhibits {
   }
 }
 
-(function($, undefined$1) {
+(function($, _) {
 
   /*
   * SerializedForm is built as a singleton jQuery plugin. It needs to be able to
@@ -4996,7 +5038,7 @@ class Locks {
       $('li', thumbList).each(function(){
         var thisThumb  = $(this),
             image      = $('img', thisThumb),
-            totalWidth = width += thisThumb.width();
+            totalWidth = width += thisThumb.width(),
             position   = (thumbList.position().left + totalWidth) - thisThumb.width();
 
         if(position >= 0 && position < viewportWidth) {
@@ -5289,7 +5331,7 @@ class ReadonlyCheckbox {
       addAutocompleteBehavior($(this));
     });
 
-    function addAutocompleteBehavior( typeAheadInput, settings ) {
+    function addAutocompleteBehavior( typeAheadInput, _ ) {
       var settings = $.extend({
         displayKey: 'title',
         minLength: 0,
@@ -5414,7 +5456,7 @@ const Module = (function() {
             var children = data[i]['children'];
             for(var child in children){
               var id = children[child]['id'];
-              child_node = findNode(id, container);
+              var child_node = findNode(id, container);
               setWeight(child_node, weight++);
               setParent(child_node, parent_id);
             }
@@ -6279,8 +6321,8 @@ SirTrevor.Blocks.Oembed =  (function(){
       </div>
       <div class="row">
         <div class="form-group mb-3 col-md-8">
-          <label for="${this.formId(id_key)}">${i18n.t("blocks:oembed:url")}</label>
-          <input name="${id_key}" class="form-control col-md-6" type="text" id="${this.formId(id_key)}" />
+          <label for="${this.formId(this.id_key)}">${i18n.t("blocks:oembed:url")}</label>
+          <input name="${this.id_key}" class="form-control col-md-6" type="text" id="${this.formId(this.id_key)}" />
         </div>
       </div>
       ${this.text_area()}
@@ -6535,8 +6577,6 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
     auto_play_images_interval_key: "auto-play-images-interval",
     max_height_key: "max-height",
 
-    item_options: function() { return "" },
-
     carouselCycleTimesInSeconds: {
       values: [ 3, 5, 8, 12, 20 ],
       selected: 5