Skip to content

Commit

Permalink
utteranceQueue usages from singleton to sim.display, phetsims/utteran…
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Nov 6, 2019
1 parent f2794da commit 89887ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 2 additions & 4 deletions js/view/ISLCAlertManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ define( require => {
const ActivationUtterance = require( 'UTTERANCE_QUEUE/ActivationUtterance' );
const inverseSquareLawCommon = require( 'INVERSE_SQUARE_LAW_COMMON/inverseSquareLawCommon' );
const ISLCA11yStrings = require( 'INVERSE_SQUARE_LAW_COMMON/ISLCA11yStrings' );
const utteranceQueue = require( 'UTTERANCE_QUEUE/utteranceQueue' );

// strings
// strings
const forceValuesHiddenString = ISLCA11yStrings.forceValuesHidden.value;

class ISLCAlertManager {
Expand Down Expand Up @@ -52,7 +50,7 @@ define( require => {
}

this.showForceValuesUtterance.alert = alert;
utteranceQueue.addToBack( this.showForceValuesUtterance );
phet.joist.sim.display.utteranceQueue.addToBack( this.showForceValuesUtterance );
}
}

Expand Down
5 changes: 2 additions & 3 deletions js/view/ISLCRulerNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ define( require => {
const StringUtils = require( 'PHETCOMMON/util/StringUtils' );
const Util = require( 'DOT/Util' );
const Utterance = require( 'UTTERANCE_QUEUE/Utterance' );
const utteranceQueue = require( 'UTTERANCE_QUEUE/utteranceQueue' );
const Vector2 = require( 'DOT/Vector2' );
const Vector2 = require( 'DOT/Vector2' );

// strings
const unitsCentimetersString = require( 'string!INVERSE_SQUARE_LAW_COMMON/units.centimeters' );
Expand Down Expand Up @@ -203,7 +202,7 @@ define( require => {

onGrab: () => {
grabbedUtterance.alert = rulerDescriber.getRulerGrabbedAlertable();
utteranceQueue.addToBack( grabbedUtterance );
phet.joist.sim.display.utteranceQueue.addToBack( grabbedUtterance );
},

listenersForDrag: [ keyboardDragListener ]
Expand Down

0 comments on commit 89887ad

Please sign in to comment.