Skip to content

Commit 01851ff

Browse files
committed
consolidate two iiif js assets (DLC-1008)
1 parent 89f211c commit 01851ff

File tree

5 files changed

+16
-90
lines changed

5 files changed

+16
-90
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<div id="aiiif" class="container-fluid px-0 w-100" data-manifest="<%= iiif_manifest %>">
1+
<div id="mirador" class="container-fluid px-0 w-100" data-manifest="<%= iiif_manifest %>" data-use-folders="true">
22
</div>

app/javascript/iiif-archives.js

-82
This file was deleted.

app/javascript/iiif.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import hintingSidebar from '@columbia-libraries/mirador/dist/es/src/culPlugins/m
66
import videoJSPlugin from '@columbia-libraries/mirador/dist/es/src/culPlugins/mirador-videojs';
77
import viewerNavigation from '@columbia-libraries/mirador/dist/es/src/culPlugins/mirador-pageIconViewerNavigation';
88
import viewXmlPlugin from '@columbia-libraries/mirador/dist/es/src/culPlugins/mirador-viewXml';
9+
import collectionFoldersPlugin from '@columbia-libraries/mirador/dist/es/src/culPlugins/mirador-selectCollectionFolders';
910

1011
const flattenPluginConfigs = (...plugins) => plugins.reduce(
1112
(acc, curr) => {
@@ -14,9 +15,10 @@ const flattenPluginConfigs = (...plugins) => plugins.reduce(
1415
);
1516

1617
$(document).ready(function(){
17-
const manifestUrl = $('#mirador').data('manifest');
18+
const miradorDiv = $('#mirador');
19+
const manifestUrl = miradorDiv.data('manifest');
1820
if (manifestUrl) {
19-
const numChildren = $('#mirador').data('num-children');
21+
const numChildren = miradorDiv.data('num-children');
2022
const startCanvas = function(queryParams) {
2123
if (queryParams.get("canvas")) {
2224
const canvases = queryParams.get("canvas").split(',');
@@ -31,6 +33,14 @@ $(document).ready(function(){
3133
];
3234
viewConfig.defaultView = 'single';
3335
}
36+
const culMiradorPlugins = flattenPluginConfigs(
37+
canvasRelatedLinksPlugin, citationSidebar, hintingSidebar, miradorDownloadPlugins,
38+
videoJSPlugin, viewerNavigation, viewXmlPlugin
39+
);
40+
const foldersAttValue = miradorDiv.data('use-folders');
41+
const useFolders = (new Boolean(foldersAttValue).valueOf() && !String.toString(foldersAttValue).match(/false/i));
42+
if (useFolders) culMiradorPlugins.push(...collectionFoldersPlugin);
43+
3444
Mirador.viewer(
3545
{
3646
id: 'mirador',
@@ -76,7 +86,7 @@ $(document).ready(function(){
7686
en: { openCompanionWindow_citation: "Citation" },
7787
},
7888
},
79-
flattenPluginConfigs(canvasRelatedLinksPlugin, citationSidebar, hintingSidebar, miradorDownloadPlugins, videoJSPlugin, viewerNavigation, viewXmlPlugin),
89+
culMiradorPlugins,
8090
);
8191
}
8292
});

app/views/shared/_head_includes.html.erb

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DLC VERSION: <%= IO.read(Rails.root.to_s+'/VERSION') %> -->
3434
<%- is_iiif_client ||= Array(@document&.fetch(:dc_type_sim, nil)).include?('InteractiveResource') ? structured_children_of_valid_types(document: @document).present? : true -%>
3535
<%- end -%>
3636
<%- is_iiif_client ||= archive_org_id_for_document(@document) -%>
37-
<%- is_file_system = is_file_system?(@document) -%>
37+
<%- is_iiif_client ||= is_file_system?(@document) -%>
3838
<%= stylesheet_link_tag('iiif' , media: 'all') if @document && params[:action] != 'synchronizer' %>
3939
4040
<!-- OHSynchronizer -->
@@ -53,7 +53,6 @@ DLC VERSION: <%= IO.read(Rails.root.to_s+'/VERSION') %> -->
5353
<%- js_packs << 'ohsynchronizer' %>
5454
<%- else -%>
5555
<%- js_packs << 'iiif' if is_iiif_client %>
56-
<%- js_packs << 'iiif-archives' if is_file_system %>
5756
<% end %>
5857
<%= javascript_pack_tag *js_packs %>
5958

config/application.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ class Application < Rails::Application
5050
'd3.js',
5151
'sites.js', 'sites.css',
5252
'easymde.min.js', 'easymde.min.css',
53-
'iiif.js', 'iiif.css',
54-
'iiif-archives.js'
53+
'iiif.js', 'iiif.css'
5554
]
5655

5756
# And include styles for all configured subsite layouts

0 commit comments

Comments
 (0)