Skip to content

Commit

Permalink
rename tandems for grabDragInteraction
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Nov 19, 2019
1 parent 6971ac5 commit b54d575
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
6 changes: 3 additions & 3 deletions js/friction/view/book/BookNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ define( require => {
this.focusHighlight = focusHighlightRect; // this is a constraint of the grab/drag interaction;

// @private - a11y
this.a11yGrabDragInteractionNode = new FrictionGrabDragInteraction( model, this, {
this.grabDragInteraction = new FrictionGrabDragInteraction( model, this, {
objectToGrabString: chemistryBookString,

// Empirically determined values to place the cue above the book.
Expand All @@ -146,7 +146,7 @@ define( require => {

listenersForDrag: [ this.keyboardDragHandler, focusListener ],

tandem: tandem.createTandem( 'a11yGrabDragInteractionNode' )
tandem: tandem.createTandem( 'grabDragInteraction' )
} );


Expand Down Expand Up @@ -178,7 +178,7 @@ define( require => {
* @public
*/
reset: function() {
this.a11yGrabDragInteractionNode.reset();
this.grabDragInteraction.reset();
}
} );
} );
6 changes: 3 additions & 3 deletions js/friction/view/magnifier/MagnifierNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ define( require => {


// a11y
const a11yGrabDragInteractionNode = new FrictionGrabDragInteraction( model, dragArea, {
const grabDragInteraction = new FrictionGrabDragInteraction( model, dragArea, {
objectToGrabString: zoomedInChemistryBookString,
tandem: tandem.createTandem( 'magnifierNodeGrabButton' ),
tandem: tandem.createTandem( 'grabDragInteraction' ),
grabCueOptions: {
center: dragArea.center.minusXY( 0, 73 )
},
Expand Down Expand Up @@ -333,7 +333,7 @@ define( require => {

// @private
this.resetMagnifierNode = function() {
a11yGrabDragInteractionNode.reset();
grabDragInteraction.reset();
};
}

Expand Down
56 changes: 28 additions & 28 deletions js/phet-io/friction-phet-io-elements-baseline.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"friction.frictionScreen.view.atomicView.magnifierNodeGrabButton.pressListener.pressAction": {
"friction.frictionScreen.view.atomicView.grabDragInteraction.pressListener.pressAction": {
"phetioDocumentation": "Executes whenever a press occurs. The first argument when executing can be used to convey info about the Event. The arguments are:<br/><ol><li>event: EventIO</li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
Expand All @@ -274,7 +274,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<EventIO>"
},
"friction.frictionScreen.view.atomicView.magnifierNodeGrabButton.pressListener.releaseAction": {
"friction.frictionScreen.view.atomicView.grabDragInteraction.pressListener.releaseAction": {
"phetioDocumentation": "Executes whenever a release occurs. The arguments are:<br/><ol><li>event: NullableIO<EventIO></li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
Expand Down Expand Up @@ -560,32 +560,6 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"friction.frictionScreen.view.topBookNode.a11yGrabDragInteractionNode.pressListener.pressAction": {
"phetioDocumentation": "Executes whenever a press occurs. The first argument when executing can be used to convey info about the Event. The arguments are:<br/><ol><li>event: EventIO</li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
"phetioEventType": "USER",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": false,
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<EventIO>"
},
"friction.frictionScreen.view.topBookNode.a11yGrabDragInteractionNode.pressListener.releaseAction": {
"phetioDocumentation": "Executes whenever a release occurs. The arguments are:<br/><ol><li>event: NullableIO<EventIO></li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
"phetioEventType": "USER",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": false,
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<NullableIO<EventIO>>"
},
"friction.frictionScreen.view.topBookNode.dragHandler": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
Expand Down Expand Up @@ -651,6 +625,32 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"friction.frictionScreen.view.topBookNode.grabDragInteraction.pressListener.pressAction": {
"phetioDocumentation": "Executes whenever a press occurs. The first argument when executing can be used to convey info about the Event. The arguments are:<br/><ol><li>event: EventIO</li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
"phetioEventType": "USER",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": false,
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<EventIO>"
},
"friction.frictionScreen.view.topBookNode.grabDragInteraction.pressListener.releaseAction": {
"phetioDocumentation": "Executes whenever a release occurs. The arguments are:<br/><ol><li>event: NullableIO<EventIO></li></ol>",
"phetioDynamicElement": false,
"phetioDynamicElementPrototype": false,
"phetioEventType": "USER",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": false,
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<NullableIO<EventIO>>"
},
"friction.frictionScreen.view.topBookNode.titleText": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
Expand Down

0 comments on commit b54d575

Please sign in to comment.