Skip to content

Commit 00603e3

Browse files
hackartisanhackartisan
committed
Update universalviewer from 3 to 4, use package via yarn
closes #5778
1 parent 2068588 commit 00603e3

File tree

91 files changed

+2430
-144328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2430
-144328
lines changed

‎app/assets/stylesheets/components/viewer.scss

+1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@
3131
left: 0;
3232
width: 100%;
3333
height: 100%;
34+
border: none;
3435
}

‎app/javascript/entrypoints/viewer.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
import UVManager from '@viewer/uv_manager'
22
import 'leaflet/dist/leaflet.css'
33
const UVManagerInstance = new UVManager()
4-
let timer = window.setInterval(() => {
5-
if (window.UV !== undefined) {
6-
UVManagerInstance.initialize()
7-
window.clearInterval(timer)
8-
}
9-
}, 5)
4+
UVManagerInstance.initialize()

‎app/javascript/viewer/uv_manager.js

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* global UV, $, createUV */
1+
import { init, IIIFURLAdapter } from "universalviewer";
2+
import "universalviewer/dist/esm/index.css";
23
import CDLTimer from '@viewer/cdl_timer'
34
import IIIFLogo from '@images/iiif-logo.svg'
45
import StatementOnHarmfulContentIcon from '@images/statement.png'
@@ -91,24 +92,30 @@ export default class UVManager {
9192
}
9293

9394
createUV (data, status, graphqlData) {
95+
console.log("configURI")
96+
console.log(this.configURI)
9497
this.tabManager.onTabSelect(() => setTimeout(() => this.resize(), 100))
9598
this.processTitle(graphqlData)
9699
this.uvElement.show()
97-
this.uv = createUV('#uv', {
98-
root: 'uv',
99-
iiifResourceUri: this.manifest,
100+
const opts = {
100101
configUri: this.configURI,
101-
collectionIndex: Number(this.urlDataProvider.get('c', 0)),
102-
manifestIndex: Number(this.urlDataProvider.get('m', 0)),
103-
sequenceIndex: Number(this.urlDataProvider.get('s', 0)),
104-
canvasIndex: Number(this.urlDataProvider.get('cv', 0)),
105-
rangeId: this.urlDataProvider.get('rid', 0),
106-
rotation: Number(this.urlDataProvider.get('r', 0)),
107-
xywh: this.urlDataProvider.get('xywh', ''),
108-
embedded: true
109-
}, this.urlDataProvider)
102+
manifest: this.manifest,
103+
embedded: true,
104+
collectionIndex:
105+
this.iiifUrlAdapter.get('c') !== undefined
106+
? Number(this.iiifUrlAdapter.get('c'))
107+
: undefined,
108+
manifestIndex: Number(this.iiifUrlAdapter.get('m', 0)),
109+
canvasIndex: Number(this.iiifUrlAdapter.get('cv', 0)),
110+
rotation: Number(this.iiifUrlAdapter.get('r', 0)),
111+
rangeId: this.iiifUrlAdapter.get('rid', ''),
112+
xywh: this.iiifUrlAdapter.get('xywh', ''),
113+
sequenceIndex: Number(this.iiifUrlAdapter.get('s', 0))
114+
}
110115
this.cdlTimer = new CDLTimer(this.figgyId)
111116
this.cdlTimer.initializeTimer()
117+
118+
init("uv", opts);
112119
}
113120

114121
addViewerIcons () {
@@ -186,7 +193,7 @@ export default class UVManager {
186193
if (this.isFiggyManifest) {
187194
return '/viewer/config/' + this.manifest.replace('/manifest', '').replace(/.*\//, '') + '.json'
188195
} else {
189-
return this.urlDataProvider.get('config')
196+
return this.iiifUrlAdapter.get('config')
190197
}
191198
}
192199

@@ -236,12 +243,12 @@ export default class UVManager {
236243
})
237244
}
238245

239-
get urlDataProvider () {
240-
return new UV.URLDataProvider(false)
246+
get iiifUrlAdapter () {
247+
return new IIIFURLAdapter();
241248
}
242249

243250
get manifest () {
244-
return this.urlDataProvider.get('manifest')
251+
return this.iiifUrlAdapter.get('manifest')
245252
}
246253

247254
get uvElement () {

‎app/views/layouts/viewer_layout.html.erb

-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
<head>
33
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
44
<%= csrf_meta_tag %>
5-
<link rel="stylesheet" type="text/css" href="uv/uv.css">
65
<%= vite_javascript_tag 'viewer' %>
76
<%= stylesheet_link_tag 'viewer' %>
87
<%= yield :head %>
9-
<script type="text/javascript" src="/uv/lib/offline.js"></script>
10-
<script type="text/javascript" src="/uv/lib/offline.js"></script>
11-
<script type="text/javascript" src="/uv/helpers.js"></script>
128
</head>
139
<body>
1410
<%= yield %>
15-
<script type="text/javascript" src="/uv/uv.js"></script>
1611
</body>
1712
</html>

‎db/structure.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ ALTER SEQUENCE public.active_storage_variant_records_id_seq OWNED BY public.acti
155155
CREATE TABLE public.ar_internal_metadata (
156156
key character varying NOT NULL,
157157
value character varying,
158-
created_at timestamp without time zone NOT NULL,
159-
updated_at timestamp without time zone NOT NULL
158+
created_at timestamp(6) without time zone NOT NULL,
159+
updated_at timestamp(6) without time zone NOT NULL
160160
);
161161

162162

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"rollup-plugin-gzip": "^3.1.0",
3535
"sass": "^1.62.1",
3636
"unfetch": "^4.0.1",
37+
"universalviewer": "^4.0.19",
3738
"vue": "^2.5.17",
3839
"vue-details": "^1.1.0",
3940
"vue-loader": "^15.4.2",

‎public/uv/build.js.map

-236
This file was deleted.

‎public/uv/favicon.ico

-276 Bytes
Binary file not shown.

‎public/uv/helpers.js

-173
This file was deleted.

‎public/uv/img/pixel.gif

-1.07 KB
Binary file not shown.

‎public/uv/info.json

-1
This file was deleted.

0 commit comments

Comments
 (0)