rename distanceProperty -> separationProperty, phetsims/gravity-force…

…-lab#76
phetsims · Aug 22, 2019 · 11264d1 · 11264d1
1 parent 935c4dc
commit 11264d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/js/gravity-force-lab-basics/view/DistanceArrowNode.js b/js/gravity-force-lab-basics/view/DistanceArrowNode.js
@@ -68,7 +68,7 @@ define( require => {
 
           // update label text and center, distance in meters so divide by 1000 to read out in km
           labelText.setText( StringUtils.fillIn( distanceUnitsPatternString, {
-            distance: model.distanceProperty.get() / 1000 // m to km
+            distance: model.separationProperty.get() / 1000 // m to km
           } ) );
 
           labelText.centerX = arrowNode.centerX;

diff --git a/js/gravity-force-lab-basics/view/GFLBScreenView.js b/js/gravity-force-lab-basics/view/GFLBScreenView.js
@@ -162,7 +162,7 @@ define( require => {
 
       Property.multilink( [
 
-          // Linking to `model.distanceProperty` (back when the distanceProperty was in GFLBModel) caused the same bug as in GFLB#103, so we are linking to
+          // Linking to `model.separationProperty` caused the same bug as in GFLB#103, so we are linking to
           // both objects' positionProperty instead.
           model.object1.positionProperty,
           model.object2.positionProperty,
@@ -240,7 +240,7 @@ define( require => {
       // sound generation for masses (almost) colliding with one another
       const innerBoundarySoundClip = new SoundClip( innerBoundarySound, { initialOutputLevel: 0.5 } );
       soundManager.addSoundGenerator( innerBoundarySoundClip );
-      model.distanceProperty.lazyLink( ( distance, previousDistance ) => {
+      model.separationProperty.lazyLink( ( distance, previousDistance ) => {
         if ( distance < previousDistance ) {
 
           // the distance value from the ISLC model is rounded to 100s of meters, so we do the same thing here

diff --git a/js/phet-io/gravity-force-lab-basics-phet-io-elements-baseline.js b/js/phet-io/gravity-force-lab-basics-phet-io-elements-baseline.js
@@ -889,7 +889,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
       "phetioStudioControl": true,
       "phetioTypeName": "PropertyIO.<BooleanIO>"
     },
-    "gravityForceLabBasics.gravityForceLabBasicsScreen.model.distanceProperty": {
+    "gravityForceLabBasics.gravityForceLabBasicsScreen.model.separationProperty": {
       "phetioDocumentation": "The distance between the two objects' centers",
       "phetioDynamicElement": false,
       "phetioEventType": "MODEL",