Skip to content

Commit

Permalink
uncomment mass change alerts, update mass alert pattern string with k…
Browse files Browse the repository at this point in the history
…ilograms, see #109
  • Loading branch information
mbarlow12 committed Dec 13, 2018
1 parent f237b24 commit 43e714b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions js/gravity-force-lab/view/GravityForceLabAlertManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ define( require => {
}
} );

// model.object1.valueProperty.lazyLink( ( value, oldValue ) => {
// utteranceQueue.clear();
// this.alertMassValueChanged( value, oldValue );
// } );
//
// model.object2.valueProperty.lazyLink( ( value, oldValue ) => {
// utteranceQueue.clear();
// this.alertMassValueChanged( value, oldValue );
// } );
model.object1.valueProperty.lazyLink( ( value, oldValue ) => {
utteranceQueue.clear();
this.alertMassValueChanged( value, oldValue );
} );

model.object2.valueProperty.lazyLink( ( value, oldValue ) => {
utteranceQueue.clear();
this.alertMassValueChanged( value, oldValue );
} );
}

alertScientificNotation( displayInScientificNotation ) {
Expand Down
2 changes: 1 addition & 1 deletion js/gravity-force-lab/view/GravityForceLabStringManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ define( require => {
}

getMassControlFocusAlertText( objectEnum ) {
const pattern = '{{massValue}}, {{size}}, {{relativeSize}} {{otherObject}}';
const pattern = '{{massValue}} kilograms, {{size}}, {{relativeSize}} {{otherObject}}';
const thisObject = objectEnum === OBJECT_ONE ? this.object1 : this.object2;
const massValue = this.formatMassValue( thisObject.valueProperty.get() );
const size = this.getSizeOfMass( massValue );
Expand Down

0 comments on commit 43e714b

Please sign in to comment.