From 0f69599c328075c2fbeecbb6ee858efc3265bd6d Mon Sep 17 00:00:00 2001 From: Edward Silverton Date: Wed, 17 Jun 2020 15:05:54 +0100 Subject: [PATCH] v3 release --- .vscode/settings.json | 6 +++++- examples | 2 +- package-lock.json | 2 +- package.json | 2 +- src/UVComponent.ts | 20 +++++++++++++++++++ .../uv-dialogues-module/SettingsDialogue.ts | 6 +++--- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d66f9162..f3e51b502 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,9 @@ "**/*.js.map": true } , -"typescript.check.workspaceVersion": false +"typescript.check.workspaceVersion": false, +"workbench.editorAssociations": [ + +], +"editor.codeActionsOnSave": null } \ No newline at end of file diff --git a/examples b/examples index 142e64645..86c3febe9 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 142e64645cbc19c03d349076795e442dcbd241cb +Subproject commit 86c3febe9ae33f08422949e5f7b423fef7c20c7f diff --git a/package-lock.json b/package-lock.json index 03bb229c2..d93f7a29c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "universalviewer", - "version": "3.1.0", + "version": "3.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 144bb3327..15a0e1bb2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "universalviewer", - "version": "3.1.0", + "version": "3.1.1", "description": "The Universal Viewer is a community-developed open source project on a mission to help you share your content with the world.", "engines": { "node": ">=8.9.1", diff --git a/src/UVComponent.ts b/src/UVComponent.ts index 18d622a74..677e90346 100644 --- a/src/UVComponent.ts +++ b/src/UVComponent.ts @@ -61,6 +61,11 @@ export default class UVComponent extends _Components.BaseComponent implements IU name: 'uv-virtex-extension' }; + this._extensions["Model"] = { + type: VirtexExtension, + name: 'uv-virtex-extension' + }; + this._extensions[manifesto.ResourceType.sound().toString()] = { type: MediaElementExtension, name: 'uv-mediaelement-extension' @@ -98,6 +103,21 @@ export default class UVComponent extends _Components.BaseComponent implements IU name: 'uv-virtex-extension' }; + this._extensions['model/gltf+json'] = { + type: VirtexExtension, + name: 'uv-virtex-extension' + }; + + this._extensions['model/gltf+json'] = { + type: VirtexExtension, + name: 'uv-virtex-extension' + }; + + this._extensions['model/gltf-binary'] = { + type: VirtexExtension, + name: 'uv-virtex-extension' + }; + this._extensions['av'] = { type: AVExtension, name: 'uv-av-extension' diff --git a/src/modules/uv-dialogues-module/SettingsDialogue.ts b/src/modules/uv-dialogues-module/SettingsDialogue.ts index d47f0349c..14b45366e 100644 --- a/src/modules/uv-dialogues-module/SettingsDialogue.ts +++ b/src/modules/uv-dialogues-module/SettingsDialogue.ts @@ -78,9 +78,9 @@ export class SettingsDialogue extends Dialogue { open(): void { super.open(); - $.getJSON(this.extension.data.root + "/info.json", (pjson: any) => { - this.$version.text("v" + pjson.version); - }); + //$.getJSON(this.extension.data.root + "/info.json", (pjson: any) => { + this.$version.text("v3.1.1"); // update this on version + //}); } private _createLocalesMenu(): void {