Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7944 from Atlante45/fix/edit-js

Browse source 
fix edit.js to handle userData that's not in JSON
This commit is contained in:
Chris Collins 2016-05-20 15:14:13 -07:00
commit 8dbc6af719
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/html/entityProperties.html
View file

@ -626,7 +626,7 @@
var parsedUserData = {}
try {
parsedUserData = JSON.parse(properties.userData);
} catch(e) {}
if ("grabbableKey" in parsedUserData) {
if ("grabbable" in parsedUserData["grabbableKey"]) {
elGrabbable.checked = parsedUserData["grabbableKey"].grabbable;
@ -638,6 +638,7 @@
elIgnoreIK.checked = parsedUserData["grabbableKey"].ignoreIK;
}
}
} catch(e) {}
elCollisionSoundURL.value = properties.collisionSoundURL;
elLifetime.value = properties.lifetime;