From b54d575f0eab6807093460bc11e52b72b6309da3 Mon Sep 17 00:00:00 2001 From: zepumph Date: Tue, 19 Nov 2019 09:43:56 -0900 Subject: [PATCH] rename tandems for grabDragInteraction --- js/friction/view/book/BookNode.js | 6 +- js/friction/view/magnifier/MagnifierNode.js | 6 +- .../friction-phet-io-elements-baseline.js | 56 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/js/friction/view/book/BookNode.js b/js/friction/view/book/BookNode.js index e6f85e64..a52c2c29 100644 --- a/js/friction/view/book/BookNode.js +++ b/js/friction/view/book/BookNode.js @@ -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. @@ -146,7 +146,7 @@ define( require => { listenersForDrag: [ this.keyboardDragHandler, focusListener ], - tandem: tandem.createTandem( 'a11yGrabDragInteractionNode' ) + tandem: tandem.createTandem( 'grabDragInteraction' ) } ); @@ -178,7 +178,7 @@ define( require => { * @public */ reset: function() { - this.a11yGrabDragInteractionNode.reset(); + this.grabDragInteraction.reset(); } } ); } ); diff --git a/js/friction/view/magnifier/MagnifierNode.js b/js/friction/view/magnifier/MagnifierNode.js index dfa8417d..1c5ef5ce 100644 --- a/js/friction/view/magnifier/MagnifierNode.js +++ b/js/friction/view/magnifier/MagnifierNode.js @@ -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 ) }, @@ -333,7 +333,7 @@ define( require => { // @private this.resetMagnifierNode = function() { - a11yGrabDragInteractionNode.reset(); + grabDragInteraction.reset(); }; } diff --git a/js/phet-io/friction-phet-io-elements-baseline.js b/js/phet-io/friction-phet-io-elements-baseline.js index ec3dc60a..2fdea806 100644 --- a/js/phet-io/friction-phet-io-elements-baseline.js +++ b/js/phet-io/friction-phet-io-elements-baseline.js @@ -261,7 +261,7 @@ window.phet.phetio.phetioElementsBaseline = assert && "phetioStudioControl": true, "phetioTypeName": "PropertyIO" }, - "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:
  1. event: EventIO
", "phetioDynamicElement": false, "phetioDynamicElementPrototype": false, @@ -274,7 +274,7 @@ window.phet.phetio.phetioElementsBaseline = assert && "phetioStudioControl": true, "phetioTypeName": "ActionIO" }, - "friction.frictionScreen.view.atomicView.magnifierNodeGrabButton.pressListener.releaseAction": { + "friction.frictionScreen.view.atomicView.grabDragInteraction.pressListener.releaseAction": { "phetioDocumentation": "Executes whenever a release occurs. The arguments are:
  1. event: NullableIO
", "phetioDynamicElement": false, "phetioDynamicElementPrototype": false, @@ -560,32 +560,6 @@ window.phet.phetio.phetioElementsBaseline = assert && "phetioStudioControl": true, "phetioTypeName": "PropertyIO" }, - "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:
  1. event: EventIO
", - "phetioDynamicElement": false, - "phetioDynamicElementPrototype": false, - "phetioEventType": "USER", - "phetioFeatured": false, - "phetioHighFrequency": false, - "phetioPlayback": false, - "phetioReadOnly": false, - "phetioState": false, - "phetioStudioControl": true, - "phetioTypeName": "ActionIO" - }, - "friction.frictionScreen.view.topBookNode.a11yGrabDragInteractionNode.pressListener.releaseAction": { - "phetioDocumentation": "Executes whenever a release occurs. The arguments are:
  1. event: NullableIO
", - "phetioDynamicElement": false, - "phetioDynamicElementPrototype": false, - "phetioEventType": "USER", - "phetioFeatured": false, - "phetioHighFrequency": false, - "phetioPlayback": false, - "phetioReadOnly": false, - "phetioState": false, - "phetioStudioControl": true, - "phetioTypeName": "ActionIO>" - }, "friction.frictionScreen.view.topBookNode.dragHandler": { "phetioDocumentation": "", "phetioDynamicElement": false, @@ -651,6 +625,32 @@ window.phet.phetio.phetioElementsBaseline = assert && "phetioStudioControl": true, "phetioTypeName": "PropertyIO" }, + "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:
  1. event: EventIO
", + "phetioDynamicElement": false, + "phetioDynamicElementPrototype": false, + "phetioEventType": "USER", + "phetioFeatured": false, + "phetioHighFrequency": false, + "phetioPlayback": false, + "phetioReadOnly": false, + "phetioState": false, + "phetioStudioControl": true, + "phetioTypeName": "ActionIO" + }, + "friction.frictionScreen.view.topBookNode.grabDragInteraction.pressListener.releaseAction": { + "phetioDocumentation": "Executes whenever a release occurs. The arguments are:
  1. event: NullableIO
", + "phetioDynamicElement": false, + "phetioDynamicElementPrototype": false, + "phetioEventType": "USER", + "phetioFeatured": false, + "phetioHighFrequency": false, + "phetioPlayback": false, + "phetioReadOnly": false, + "phetioState": false, + "phetioStudioControl": true, + "phetioTypeName": "ActionIO>" + }, "friction.frictionScreen.view.topBookNode.titleText": { "phetioDocumentation": "", "phetioDynamicElement": false,