From 4231ff1aed43ad9b691ea90aac21850a312bf03e Mon Sep 17 00:00:00 2001 From: Stephen Fraser Date: Thu, 27 Apr 2023 17:34:29 +0100 Subject: [PATCH 1/4] Updated AV Component --- package-lock.json | 22 +++++++++++++--------- package.json | 2 +- src/UniversalViewer.ts | 4 ++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 804ee34b2..6652a7378 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "^1.2.0", + "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3", @@ -261,8 +261,9 @@ }, "node_modules/@iiif/iiif-av-component": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@iiif/iiif-av-component/-/iiif-av-component-1.2.0.tgz", - "integrity": "sha512-tlJTbvjC1/pTSvAAjIPf/JdU57OFaBzUPXKgCyD3WD0GoZYTBydNEQTjlcyQ7xrp8Z1ttuG8wqIp9Q1l0B5U4A==", + "resolved": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", + "integrity": "sha512-ar6qia/txMLgt3DIWESDrjuAnIIuv6d0EOtk1Zazz5Q6j+/6LvjSESvss18Op615sfkxALcJ37MuhY7w4gwutA==", + "license": "MIT", "dependencies": { "@iiif/base-component": "2.*", "@iiif/manifold": "^2.0.5", @@ -6010,7 +6011,8 @@ "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "devOptional": true }, "node_modules/graceful-readlink": { "version": "1.0.1", @@ -10657,6 +10659,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "devOptional": true, "bin": { "mime": "cli.js" }, @@ -18201,9 +18204,8 @@ } }, "@iiif/iiif-av-component": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@iiif/iiif-av-component/-/iiif-av-component-1.2.0.tgz", - "integrity": "sha512-tlJTbvjC1/pTSvAAjIPf/JdU57OFaBzUPXKgCyD3WD0GoZYTBydNEQTjlcyQ7xrp8Z1ttuG8wqIp9Q1l0B5U4A==", + "version": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", + "integrity": "sha512-ar6qia/txMLgt3DIWESDrjuAnIIuv6d0EOtk1Zazz5Q6j+/6LvjSESvss18Op615sfkxALcJ37MuhY7w4gwutA==", "requires": { "@iiif/base-component": "2.*", "@iiif/manifold": "^2.0.5", @@ -22849,7 +22851,8 @@ "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "devOptional": true }, "graceful-readlink": { "version": "1.0.1", @@ -26596,7 +26599,8 @@ "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "devOptional": true }, "mime-db": { "version": "1.52.0", diff --git a/package.json b/package.json index 1f4fcfb9f..93bf4ec5f 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "^1.2.0", + "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3", diff --git a/src/UniversalViewer.ts b/src/UniversalViewer.ts index 85f4edb12..190a75216 100644 --- a/src/UniversalViewer.ts +++ b/src/UniversalViewer.ts @@ -39,6 +39,10 @@ export class UniversalViewer extends BaseContentHandler { this._assignContentHandler(this.options.data); } + public get() { + return this._assignedContentHandler; + } + public on(name: string, cb: Function, ctx?: any): void { this._externalEventListeners.push({ name, From cb3baa62dd0fa0ad90cb677d5bfd966e513caff0 Mon Sep 17 00:00:00 2001 From: Stephen Fraser Date: Thu, 4 May 2023 22:07:29 +0100 Subject: [PATCH 2/4] Added config options for share / embed enabled --- .../iiif/modules/uv-dialogues-module/ShareDialogue.ts | 10 ++++++++-- .../iiif/modules/uv-shared-module/BaseExtension.ts | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/content-handlers/iiif/modules/uv-dialogues-module/ShareDialogue.ts b/src/content-handlers/iiif/modules/uv-dialogues-module/ShareDialogue.ts index e44fadeee..866ed44ea 100644 --- a/src/content-handlers/iiif/modules/uv-dialogues-module/ShareDialogue.ts +++ b/src/content-handlers/iiif/modules/uv-dialogues-module/ShareDialogue.ts @@ -84,15 +84,21 @@ export class ShareDialogue extends Dialogue { this.$tabs = $('
'); this.$content.append(this.$tabs); + this.$shareButton = $( '" ); - this.$tabs.append(this.$shareButton); + if (Bools.getBool(this.config.options.shareEnabled, true)) { + this.$tabs.append(this.$shareButton); + } + this.$embedButton = $( '' + this.content.embed + "" ); - this.$tabs.append(this.$embedButton); + if (Bools.getBool(this.config.options.embedEnabled, false)) { + this.$tabs.append(this.$embedButton); + } this.$tabsContent = $('
'); this.$content.append(this.$tabsContent); diff --git a/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts b/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts index 6c7327227..e89843dd5 100644 --- a/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts +++ b/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts @@ -721,6 +721,14 @@ export class BaseExtension implements IExtension { } return related["@id"]; } + + // If there's a `homepage` property in the manifest + const manifest = this.helper.manifest; + const homepage = manifest && manifest.getHomepage(); + if (homepage) { + // Use the `homepage` property in the URL box + return homepage; + } } return null; From f284009de45bdf9e3120a7c90c483d4b45d6ff94 Mon Sep 17 00:00:00 2001 From: Stephen Fraser Date: Thu, 4 May 2023 22:08:39 +0100 Subject: [PATCH 3/4] Integration of external time fix AV --- package-lock.json | 10 +++++----- package.json | 2 +- .../modules/uv-avcenterpanel-module/AVCenterPanel.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6652a7378..1e1e86ce7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", + "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3", @@ -261,8 +261,8 @@ }, "node_modules/@iiif/iiif-av-component": { "version": "1.2.0", - "resolved": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", - "integrity": "sha512-ar6qia/txMLgt3DIWESDrjuAnIIuv6d0EOtk1Zazz5Q6j+/6LvjSESvss18Op615sfkxALcJ37MuhY7w4gwutA==", + "resolved": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", + "integrity": "sha512-WzQpmEJocZu9sKma7g6GjkKvWtWa2JM7KPj8N9PYOaSVX1yFb7f7xVtZ1AzlcD0If/GqViszhZFHxA5wf/8xEw==", "license": "MIT", "dependencies": { "@iiif/base-component": "2.*", @@ -18204,8 +18204,8 @@ } }, "@iiif/iiif-av-component": { - "version": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", - "integrity": "sha512-ar6qia/txMLgt3DIWESDrjuAnIIuv6d0EOtk1Zazz5Q6j+/6LvjSESvss18Op615sfkxALcJ37MuhY7w4gwutA==", + "version": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", + "integrity": "sha512-WzQpmEJocZu9sKma7g6GjkKvWtWa2JM7KPj8N9PYOaSVX1yFb7f7xVtZ1AzlcD0If/GqViszhZFHxA5wf/8xEw==", "requires": { "@iiif/base-component": "2.*", "@iiif/manifold": "^2.0.5", diff --git a/package.json b/package.json index 93bf4ec5f..e2f067e17 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/889adf97/@iiif/iiif-av-component", + "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3", diff --git a/src/content-handlers/iiif/modules/uv-avcenterpanel-module/AVCenterPanel.ts b/src/content-handlers/iiif/modules/uv-avcenterpanel-module/AVCenterPanel.ts index 43c9b6f98..e5685c999 100644 --- a/src/content-handlers/iiif/modules/uv-avcenterpanel-module/AVCenterPanel.ts +++ b/src/content-handlers/iiif/modules/uv-avcenterpanel-module/AVCenterPanel.ts @@ -55,7 +55,7 @@ export class AVCenterPanel extends CenterPanel { (currentTime: number) => { this._whenMediaReady(() => { if (this.avcomponent) { - this.avcomponent.setCurrentTime(currentTime); + this.avcomponent.setCurrentTime(currentTime, true); } }); } From 74ec3ee4ea3b4720852065ab12daebd10e1666bd Mon Sep 17 00:00:00 2001 From: Stephen Fraser Date: Thu, 11 May 2023 13:52:11 +0100 Subject: [PATCH 4/4] Update av component --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e1e86ce7..92978d79a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", + "@iiif/iiif-av-component": "^1.2.1", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3", @@ -260,10 +260,9 @@ "integrity": "sha512-2RbW7WXeLex6RI+kQSxq6Ym0GiVcODeQ4Km7MnnTX5BHdOGQnqVa+s6AUmAW+OFYAJ8wv9QxvNZXm7/kBdGTVw==" }, "node_modules/@iiif/iiif-av-component": { - "version": "1.2.0", - "resolved": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", - "integrity": "sha512-WzQpmEJocZu9sKma7g6GjkKvWtWa2JM7KPj8N9PYOaSVX1yFb7f7xVtZ1AzlcD0If/GqViszhZFHxA5wf/8xEw==", - "license": "MIT", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@iiif/iiif-av-component/-/iiif-av-component-1.2.1.tgz", + "integrity": "sha512-u3ttJZ1pDR1WdYuYVhmRXi216ZwQu0gzuDBu52czBxvy0eM/ZquYY6SUwgWqNQaxqdRGq7UyNMq9d95h8LcBjw==", "dependencies": { "@iiif/base-component": "2.*", "@iiif/manifold": "^2.0.5", @@ -18204,8 +18203,9 @@ } }, "@iiif/iiif-av-component": { - "version": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", - "integrity": "sha512-WzQpmEJocZu9sKma7g6GjkKvWtWa2JM7KPj8N9PYOaSVX1yFb7f7xVtZ1AzlcD0If/GqViszhZFHxA5wf/8xEw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@iiif/iiif-av-component/-/iiif-av-component-1.2.1.tgz", + "integrity": "sha512-u3ttJZ1pDR1WdYuYVhmRXi216ZwQu0gzuDBu52czBxvy0eM/ZquYY6SUwgWqNQaxqdRGq7UyNMq9d95h8LcBjw==", "requires": { "@iiif/base-component": "2.*", "@iiif/manifold": "^2.0.5", diff --git a/package.json b/package.json index e2f067e17..0f7c1d055 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@edsilv/utils": "^1.0.2", "@google/model-viewer": "^1.9.2", "@iiif/base-component": "2.0.1", - "@iiif/iiif-av-component": "https://pkg.csb.dev/IIIF-Commons/iiif-av-component/commit/7d80d2d6/@iiif/iiif-av-component", + "@iiif/iiif-av-component": "^1.2.1", "@iiif/iiif-gallery-component": "^1.1.21", "@iiif/iiif-metadata-component": "^1.1.19", "@iiif/iiif-tree-component": "^2.0.3",