formatting and renaming, see phetsims/gravity-force-lab-basics#88

phetsims · Feb 19, 2019 · c87de58 · c87de58
1 parent 607e0b7
commit c87de58
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/js/view/ISLCAlertManager.js b/js/view/ISLCAlertManager.js
@@ -41,8 +41,8 @@ define( require => {
       utteranceQueue.addToBack( utterance );
     }
 
-    alertPositionChanged( endAtEdge ) {
-      const alert = this.getPositionChangedAlertText( endAtEdge );
+    alertPositionChanged( objectsTouching ) {
+      const alert = this.getPositionChangedAlertText( objectsTouching );
       const utterance = new Utterance( { alert: alert, uniqueGroupId: 'position' } );
       utteranceQueue.addToBack( utterance );
     }
@@ -53,7 +53,7 @@ define( require => {
       utteranceQueue.addToBack( utterance );
     }
 
-    getPositionChangedAlertText( endAtEdge ) {
+    getPositionChangedAlertText( objectsTouching ) {
       let alertText = this.forceDescriber.getVectorChangeText();
       let edgeAlertText = this.forceDescriber.getVectorSizeText();
 
@@ -63,7 +63,7 @@ define( require => {
         edgeAlertText = this.forceDescriber.getVectorSizeForceValueText();
       }
 
-      return endAtEdge ? edgeAlertText : alertText;
+      return objectsTouching ? edgeAlertText : alertText;
     }
 
     getPositionUnchangedAlertText() {

diff --git a/js/view/describers/ForceDescriber.js b/js/view/describers/ForceDescriber.js
@@ -208,7 +208,12 @@ define( require => {
       const units = this.units;
 
       // In BASICS the object labels are used, in regular the fillin is a no-op because those keys aren't present.
-      return StringUtils.fillIn( pattern, { forceValue: forceValue, units: units, thisObjectLabel: thisObjectLabel, otherObjectLabel: otherObjectLabel } );
+      return StringUtils.fillIn( pattern, {
+        forceValue: forceValue,
+        units: units,
+        thisObjectLabel: thisObjectLabel,
+        otherObjectLabel: otherObjectLabel
+      } );
     }
 
     /**
@@ -302,7 +307,11 @@ define( require => {
       const size = this.vectorSize;
       const forceValue = this.formattedForce;
       const units = this.units;
-      return StringUtils.fillIn( this.vectorSizeForcesValuePatternString, { size: size, forceValue: forceValue, units: units } );
+      return StringUtils.fillIn( this.vectorSizeForcesValuePatternString, {
+        size: size,
+        forceValue: forceValue,
+        units: units
+      } );
     }
 
     /**
@@ -318,7 +327,10 @@ define( require => {
       }
       else {
         const forceClause = this.getForcesClause();
-        return StringUtils.fillIn( vectorForceClausePatternString, { vectorClause: vectorClause, forceClause: forceClause } );
+        return StringUtils.fillIn( vectorForceClausePatternString, {
+          vectorClause: vectorClause,
+          forceClause: forceClause
+        } );
       }
     }
 
@@ -381,7 +393,11 @@ define( require => {
       const changeDirection = this.changeDirection;
       const forceValue = this.formattedForce;
       const units = this.units;
-      return StringUtils.fillIn( this.vectorChangeForcesNowValuePatternString, { changeDirection: changeDirection, forceValue: forceValue, units: units } );
+      return StringUtils.fillIn( this.vectorChangeForcesNowValuePatternString, {
+        changeDirection: changeDirection,
+        forceValue: forceValue,
+        units: units
+      } );
     }
 
     /**