diff --git a/js/ISLCA11yStrings.js b/js/ISLCA11yStrings.js index 864aaa0..66eec1a 100644 --- a/js/ISLCA11yStrings.js +++ b/js/ISLCA11yStrings.js @@ -56,19 +56,19 @@ define( require => { value: '{{label}} position' }, spherePositionProgressObjectPattern: { - value: '{{position}} meter mark, {{progress}} {{otherObjectLabel}}.' + value: '{{position}} mark, {{progress}} {{otherObjectLabel}}.' }, spherePositionProgressPattern: { - value: '{{position}} meter mark, {{progress}}.' + value: '{{position}} mark, {{progress}}.' }, spherePositionRegionObjectPattern: { - value: '{{position}} meter mark, {{region}} {{otherObjectLabel}}.' + value: '{{position}} mark, {{region}} {{otherObjectLabel}}.' }, spherePositionRegionPattern: { - value: '{{position}} meter mark, {{region}}.' + value: '{{position}} mark, {{region}}.' }, spherePositionRegionLastStopPattern: { - value: '{{position}} meter mark, {{region}}, last stop.' + value: '{{position}} mark, {{region}}, last stop.' }, /************************ diff --git a/js/view/ISLCObjectNode.js b/js/view/ISLCObjectNode.js index b869270..5141d86 100644 --- a/js/view/ISLCObjectNode.js +++ b/js/view/ISLCObjectNode.js @@ -294,11 +294,11 @@ define( function( require ) { } ); this.redrawForce(); - + var defaultStepSize = options.snapToNearest > 1 ? options.snapToNearest * 2 : ISLCQueryParameters.stepSize; var accessibleSliderOptions = { - keyboardStep: ISLCQueryParameters.stepSize, + keyboardStep: defaultStepSize, shiftKeyboardStep: options.snapToNearest, - pageKeyboardStep: ISLCQueryParameters.stepSize * 2, + pageKeyboardStep: defaultStepSize * 2, accessibleDecimalPlaces: 1, constrainValue: function( value ) { return Util.toFixedNumber( value, 1 ); diff --git a/js/view/ISLCStringManager.js b/js/view/ISLCStringManager.js index 99d2c4c..a464b72 100644 --- a/js/view/ISLCStringManager.js +++ b/js/view/ISLCStringManager.js @@ -149,7 +149,7 @@ define( require => { convertForceValue: value => `${value} newtons`, - convertDistanceApart: distance => distance + convertDistanceMetric: distance => distance }, options ); // @private @@ -172,7 +172,7 @@ define( require => { this.object2 = model.object2; this.object1Label = object1Label; this.object2Label = object2Label; - this.convertDistanceApart = options.convertDistanceApart; + this.convertDistanceMetric = options.convertDistanceMetric; this.object1ValueChangedAlertText = ''; this.object2ValueChangedAlertText = ''; @@ -240,7 +240,7 @@ define( require => { object1Label: this.object1Label, object2Label: this.object2Label, qualitativeDistance: this.getQualitativeDistance(), - distance: this.convertDistanceApart( this._distanceBetween ), + distance: this.convertDistanceMetric( this._distanceBetween ), distanceUnits: this._distanceUnits }; return StringUtils.fillIn( distanceSpaceAndValueSummaryPatternString, fillObject ); @@ -283,9 +283,12 @@ define( require => { } getSpherePositionAndRegionText( position, objectEnum ) { + position = this.formatPositionUnitMark( position ); const otherObjectLabel = objectEnum === OBJECT_ONE ? this.object2Label : this.object1Label; const region = RELATIVE_DISTANCE_STRINGS[ this.getDistanceIndex( this._distanceBetween ) ]; - return StringUtils.fillIn( spherePositionRegionObjectPatternString, { position, otherObjectLabel, region } ); + const units = this._distanceUnits; + const fillObject = { position, otherObjectLabel, region, units }; + return StringUtils.fillIn( spherePositionRegionObjectPatternString, fillObject ); } getSpherePositionAriaValueText( formattedPosition, objectNode ) { @@ -294,9 +297,7 @@ define( require => { const includeOtherObject = objectNode.interactionCount < 2; const regionStringArray = includeOtherObject ? RELATIVE_DISTANCE_STRINGS : DISTANCE_STRINGS; const progressStringArray = includeOtherObject ? RELATIVE_PROGRESS_STRINGS : PROGRESS_STRINGS; - const fillObject = { - position: formattedPosition - }; + const fillObject = { position: this.formatPositionUnitMark( formattedPosition ) }; const objectPosition = thisObject.positionProperty.get(); const { min, max } = thisObject.enabledRangeProperty.get();