new a11y strings, new implementation for getting position slider text…

…, see phetsims/gravity-force-lab#124
phetsims · Dec 12, 2018 · 2665901 · 2665901
1 parent 4252621
commit 2665901
Show file tree

Hide file tree

Showing 5 changed files with 180 additions and 90 deletions.
diff --git a/js/ISLCA11yStrings.js b/js/ISLCA11yStrings.js
@@ -26,7 +26,7 @@ define( require => {
     summaryInteractionHintPattern: {
       value: 'Move spheres or change their {{massOrCharge}} to begin observations.'
     },
-    distanceSpaceAndValueSummaryPattern: {
+    distanceAndValueSummaryPattern: {
       value: '{{object1Label}} and {{object2Label}} are {{qualitativeDistance}} each other, centers exactly {{distance}} {{distanceUnits}} apart.'
     },
 
@@ -71,12 +71,34 @@ define( require => {
       value: '{{position}} mark, {{region}}, last stop.'
     },
 
+    /*
+     * 12/11/18 update for position slider aria-valuetext
+     */
+    positionDistanceFromOtherObjectPattern: {
+      value: '{{position}} mark, {{distance}} {{units}} from {{otherObjectLabel}}.'
+    },
+    distanceFromOtherObjectPattern: {
+      value: '{{distance}} {{units}} from {{otherObjectLabel}}.'
+    },
+    progressDistanceFromOtherObjectPattern: {
+      value: '{{progress}}, {{distance}} {{units}} from {{otherObjectLabel}}.'
+    },
+    lastStopDistanceFromOtherObjectPattern: {
+      value: '{{region}}, last stop, {{distance}} {{units}} from {{otherObjectLabel}}.'
+    },
+
     /************************
      * Force vector strings *
      ************************/
     forceVectorsSize: {
       value: 'Force vectors {{size}}.'
     },
+    vectorAlertNoValuePattern: {
+      value: 'Vectors {{changeOrSize}}.'
+    },
+    vectorAlertWithValuePattern: {
+      value: 'Vectors {{changeOrSize}}, forces now {{valueAndUnits}}.'
+    },
 
     /**********************
      * Qualitative Values *
@@ -160,8 +182,8 @@ define( require => {
     closer: {
       value: 'closer'
     },
-    farther: {
-      value: 'farther'
+    fartherAway: {
+      value: 'Farther away'
     },
 
 

diff --git a/js/model/ISLCModel.js b/js/model/ISLCModel.js
@@ -103,6 +103,7 @@ define( function( require ) {
 
       // update range if radius changed with "constant radius" setting (which didn't trigger other model updates)
       updateRange( object1 );
+      updateRange( object2 );
     } );
 
     this.object2.radiusProperty.link( function() {
@@ -111,6 +112,7 @@ define( function( require ) {
 
       // update range if radius changed with "constant radius" setting (which didn't trigger other model updates)
       updateRange( object2 );
+      updateRange( object1 );
     } );
   }
 

diff --git a/js/model/ISLCObject.js b/js/model/ISLCObject.js
@@ -106,6 +106,12 @@ define( function( require ) {
     reset: function() {
       this.valueProperty.reset();
       this.positionProperty.reset();
+    },
+
+    isAtEdgeOfRange: function() {
+      var range = this.enabledRangeProperty.get();
+      var x = this.positionProperty.get();
+      return x === range.min || x === range.max;
     }
   } );
 } );
diff --git a/js/view/ISLCObjectNode.js b/js/view/ISLCObjectNode.js
@@ -143,7 +143,6 @@ define( function( require ) {
     this.modelViewTransform = modelViewTransform;
 
     // @public
-    this.interactionCount = 0;
     this.enum = object === model.object1 ? ISLCObjectEnum.OBJECT_ONE : ISLCObjectEnum.OBJECT_TWO;
 
     // the full range of force for the arrow node (note: this is distinct)
@@ -307,7 +306,6 @@ define( function( require ) {
       },
       startDrag: function() {
         object.isDragging = true;
-        self.interactionCount++;
       },
       endDrag: function() {
         object.isDragging = false;
@@ -324,13 +322,6 @@ define( function( require ) {
       accessibleSliderOptions
     );
 
-    this.addInputListener( {
-      focus: function( event ) {
-        self.interactionCount = 0;
-        self.resetAriaValueText();
-      }
-    } );
-
     this.objectModel.radiusProperty.link( function() {
 
       // a11y - update the focusHighlight with the radius (Accessibility.js setter)