Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 10:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split

Browse source 
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
This commit is contained in:
Sam Gondelman 2018-02-15 09:34:59 -08:00 committed by GitHub
commit 09645c8b48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/html/js/entityProperties.js
View file

@ -798,10 +798,13 @@ function loaded() {
// HTML workaround since image is not yet a separate entity type // HTML workaround since image is not yet a separate entity type
var IMAGE_MODEL_NAME = 'default-image-model.fbx'; var IMAGE_MODEL_NAME = 'default-image-model.fbx';
var urlParts = properties.modelURL.split('/') if (properties.type === "Model") {
var propsFilename = urlParts[urlParts.length - 1]; var urlParts = properties.modelURL.split('/');
if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) { var propsFilename = urlParts[urlParts.length - 1];
properties.type = "Image";
if (propsFilename === IMAGE_MODEL_NAME) {
properties.type = "Image";
}
} }
// Create class name for css ruleset filtering // Create class name for css ruleset filtering