Skip to content

Commit

Permalink
v3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
edsilv committed Jun 17, 2020
1 parent d8f9ec7 commit 0f69599
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
"**/*.js.map": true
}
,
"typescript.check.workspaceVersion": false
"typescript.check.workspaceVersion": false,
"workbench.editorAssociations": [

],
"editor.codeActionsOnSave": null
}
2 changes: 1 addition & 1 deletion examples
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
20 changes: 20 additions & 0 deletions src/UVComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions src/modules/uv-dialogues-module/SettingsDialogue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0f69599

Please sign in to comment.