From 84282d01141ffcb15d7d541fbe3484f7e5f28f86 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 15 Jan 2016 15:28:26 -0800 Subject: [PATCH] final repairs after rebase --- examples/html/entityProperties.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index f2a8e026fb..41581845df 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -262,7 +262,7 @@ var elDensity = document.getElementById("property-density"); var elIgnoreForCollisions = document.getElementById("property-ignore-for-collisions"); - var elCollisionsWillMove = document.getElementById("property-collisions-will-move"); + var elDynamic = document.getElementById("property-dyanmict ); var elCollisionSoundURL = document.getElementById("property-collision-sound-url"); var elLifetime = document.getElementById("property-lifetime"); var elScriptURL = document.getElementById("property-script-url"); @@ -492,7 +492,7 @@ elDensity.value = properties.density.toFixed(2); elIgnoreForCollisions.checked = properties.ignoreForCollisions; - elCollisionsWillMove.checked = properties.collisionsWillMove; + elDynamic.checked = properties.dynamic; elCollisionSoundURL.value = properties.collisionSoundURL; elLifetime.value = properties.lifetime; elScriptURL.value = properties.script; @@ -719,7 +719,7 @@ elDensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('density')); elIgnoreForCollisions.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ignoreForCollisions')); - elCollisionsWillMove.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionsWillMove')); + elDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('dynamic')); elCollisionSoundURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionSoundURL')); elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));