blacklight-spotlight 3.6.0.beta6 → 3.6.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ad914a77051069115c87db6d24e42773a464a38bbe59855105e1ba7c323615
-  data.tar.gz: 01a29be86b0b4877e5d7847c3fd11b3cf900bdec4a932a049e97cc2d035cb8eb
+  metadata.gz: 8f59fc33de8461403daa1326b041fab3112dfe1a6f258cc94ac176ba2632752a
+  data.tar.gz: 5cc76ddd3bad73d112209ca51702ac4895c3817301f7d4796f413fb28d8d25eb
 SHA512:
-  metadata.gz: 9ebf452f6eaaba05fe6bfdaafb5b9bd22de0e0900ba4f28b06ce07d9da386f219db5d4d2e2ead6a657ddf0cf5a028ee2bee467e2555fcfcad07e12fd73e2f4a9
-  data.tar.gz: 9a76eeed30ca40bcba0cc0bd1ae8c9aebf9f54830a3613e60fdf4783eb571aea92b69dace93003dd3ee07f2c74a0ee75feb9f5401dd1aa682e6839b13d342ab7
+  metadata.gz: 2ea0e4c383fc413a42b5ba09fc2041a49c1b0958a8dba3a87052494bf4dd09337290241d49f7bd15154eb6a3f018041cb84e62936aa4e17a4aca60e6fca55206
+  data.tar.gz: 17f5372a8ab30a68753f8d5d31b3daf1f8d483998d6092d939942fa114a07e758a3c6ae154631a028baa1028c1052308b634d137cd259395d25757b870b8cbd0

data/README.md

@@ -19,13 +19,13 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 To bootstrap a new Rails application:
 
 ```
-$ rails new app-name -m https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb
+$ SKIP_TRANSLATION=1 rails new app-name -m https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb
 ```
 
 or from an existing Rails application:
 
 ```
-$ rails app:template LOCATION=https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb
+$ SKIP_TRANSLATION=1 rails app:template LOCATION=https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb
 ```
 
 *During this process you will be prompted to enter an initial administrator email and password (this is a super-admin that can administer any exhibit in the installation).* If you choose not to create one, the first user will be given administrative privileges.
@@ -39,7 +39,7 @@ $ cd app-name
 Run the database migrations:
 
 ```
-$ rake db:migrate
+$ SKIP_TRANSLATION=1 rake db:migrate
 ```
 
 Start Solr (possibly using `solr_wrapper` in development or testing):
@@ -118,9 +118,11 @@ See [developer-facing instructions for enabling translation](https://github.com/
 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
-components in the gem are changed, this bundle should be rebuild with the
+components in the gem are changed, this bundle should be rebuilt with the
 following steps:
 1. [Install npm](https://www.npmjs.com/get-npm)
-1. run `npm install` to download dependencies
-1. run `npm run prepare` to build the bundle
-1. run `npm publish` to push the javascript package to https://npmjs.org/package/spotlight-frontend
+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

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

@@ -6428,19 +6428,24 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
       </div>
     `},
 
-    _itemPanelIiifFields: function(index, data) {
+    // Sets the first version of the IIIF information from autocomplete data.
+    _itemPanelIiifFields: function(index, autocomplete_data) {
       return [
         // '<input type="hidden" name="item[' + index + '][iiif_region]" value="' + (data.iiif_region) + '"/>',
         // for legacy compatiblity:
-        '<input type="hidden" name="item[' + index + '][thumbnail_image_url]" value="' + (data.thumbnail_image_url || data.thumbnail || "") + '"/>',
-        '<input type="hidden" name="item[' + index + '][full_image_url]" value="' + (data.full_image_url || data.thumbnail_image_url || data.thumbnail || "") + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_tilesource]" value="' + (data.iiif_tilesource) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_manifest_url]" value="' + (data.iiif_manifest_url) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_canvas_id]" value="' + (data.iiif_canvas_id) + '"/>',
-        '<input type="hidden" name="item[' + index + '][iiif_image_id]" value="' + (data.iiif_image_id) + '"/>',
+        '<input type="hidden" name="item[' + index + '][thumbnail_image_url]" value="' + (autocomplete_data.thumbnail_image_url || autocomplete_data.thumbnail || "") + '"/>',
+        '<input type="hidden" name="item[' + index + '][full_image_url]" value="' + (autocomplete_data.full_image_url || autocomplete_data.thumbnail_image_url || autocomplete_data.thumbnail || "") + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_tilesource]" value="' + (autocomplete_data.iiif_tilesource) + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_manifest_url]" value="' + (autocomplete_data.iiif_manifest_url) + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_canvas_id]" value="' + (autocomplete_data.iiif_canvas_id) + '"/>',
+        '<input type="hidden" name="item[' + index + '][iiif_image_id]" value="' + (autocomplete_data.iiif_image_id) + '"/>',
       ].join("\n");
     },
-    setIiifFields: function(panel, data, initialize) {
+    // Overwrites the hidden inputs from _itemPanelIiifFields with data from the
+    // manifest. Called by afterPanelRender - the manifest_data here is built
+    // from canvases in the manifest, transformed by spotlight/admin/iiif.js in
+    // the #images method.
+    setIiifFields: function(panel, manifest_data, initialize) {
       var legacyThumbnailField = $(panel).find('[name$="[thumbnail_image_url]"]');
       var legacyFullField = $(panel).find('[name$="[full_image_url]"]');
 
@@ -6450,11 +6455,11 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
 
       legacyThumbnailField.val("");
       legacyFullField.val("");
-      $(panel).find('[name$="[iiif_image_id]"]').val(data.imageId);
-      $(panel).find('[name$="[iiif_tilesource]"]').val(data.tilesource);
-      $(panel).find('[name$="[iiif_manifest_url]"]').val(data.manifest);
-      $(panel).find('[name$="[iiif_canvas_id]"]').val(data.canvasId);
-      $(panel).find('img.img-thumbnail').attr('src', data.thumbnail_image_url || data.tilesource.replace("/info.json", "/full/100,100/0/default.jpg"));
+      $(panel).find('[name$="[iiif_image_id]"]').val(manifest_data.imageId);
+      $(panel).find('[name$="[iiif_tilesource]"]').val(manifest_data.tilesource);
+      $(panel).find('[name$="[iiif_manifest_url]"]').val(manifest_data.manifest);
+      $(panel).find('[name$="[iiif_canvas_id]"]').val(manifest_data.canvasId);
+      $(panel).find('img.img-thumbnail').attr('src', manifest_data.thumbnail_image_url || manifest_data.tilesource.replace("/info.json", "/full/100,100/0/default.jpg"));
     },
     afterPanelRender: function(data, panel) {
       var context = this;