Skip to content

Commit

Permalink
Rename abSwitch -> columnSwitch, see #101
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisklus
chrisklus committed Jan 29, 2020
1 parent 112df18 commit ea7ca11
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
6 changes: 3 additions & 3 deletions js/common/view/ColumnOnOffController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ define( require => {
}, options );
Node.call( this );

const abSwitch = new ABSwitch( columnState, ColumnState.DOUBLE_COLUMNS, new ColumnControlIcon( ICON_WIDTH, true ), ColumnState.NO_COLUMNS, new ColumnControlIcon( ICON_WIDTH, false ), {
const columnSwitch = new ABSwitch( columnState, ColumnState.DOUBLE_COLUMNS, new ColumnControlIcon( ICON_WIDTH, true ), ColumnState.NO_COLUMNS, new ColumnControlIcon( ICON_WIDTH, false ), {
switchSize: new Dimension2( 32, 16 ),
thumbTouchAreaXDilation: 5,
thumbTouchAreaYDilation: 5,
tandem: options.tandem.createTandem( 'abSwitch' )
tandem: options.tandem.createTandem( 'columnSwitch' )
} );

// TODO: These options were misplaced, should they be deleted?
// fill: 'rgb( 240, 240, 240 )',
// cornerRadius: 5
const panel = new Panel( abSwitch );
const panel = new Panel( columnSwitch );
this.addChild( panel );

if ( BAQueryParameters.stanford ) {
Expand Down
60 changes: 30 additions & 30 deletions js/phet-io/balancing-act-phet-io-elements-baseline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -144,7 +144,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.aInputListener": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.aInputListener": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -157,7 +157,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ButtonListenerIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.bInputListener": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.bInputListener": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -170,7 +170,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ButtonListenerIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "USER",
Expand All @@ -183,7 +183,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "OnOffSwitchIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.opacityProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -196,7 +196,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.pickableProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -209,7 +209,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "USER",
Expand All @@ -222,7 +222,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ObjectIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragAction": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -235,7 +235,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragEndAction": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragEndAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag end in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -248,7 +248,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragStartAction": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragStartAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag start in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -261,7 +261,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.isDraggingProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.isDraggingProperty": {
"phetioDocumentation": "Indicates whether the object is dragging",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -274,7 +274,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.onOffSwitch.visibleProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.onOffSwitch.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -287,7 +287,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.opacityProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -300,7 +300,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.pickableProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -313,7 +313,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
},
"balancingAct.balanceLabScreen.view.columnControlPanel.abSwitch.visibleProperty": {
"balancingAct.balanceLabScreen.view.columnControlPanel.columnSwitch.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand Down Expand Up @@ -6865,7 +6865,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6878,7 +6878,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.aInputListener": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.aInputListener": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6891,7 +6891,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ButtonListenerIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.bInputListener": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.bInputListener": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6904,7 +6904,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ButtonListenerIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "USER",
Expand All @@ -6917,7 +6917,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "OnOffSwitchIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.opacityProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6930,7 +6930,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.pickableProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6943,7 +6943,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "USER",
Expand All @@ -6956,7 +6956,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ObjectIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragAction": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6969,7 +6969,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragEndAction": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragEndAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag end in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6982,7 +6982,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.dragStartAction": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.dragStartAction": {
"phetioDocumentation": "A function that executes. The arguments are:<br/><ol><li>point: Vector2IO. the position of the drag start in view coordinates</li></ol>",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -6995,7 +6995,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "ActionIO<Vector2IO>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.simpleDragHandler.isDraggingProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.simpleDragHandler.isDraggingProperty": {
"phetioDocumentation": "Indicates whether the object is dragging",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -7008,7 +7008,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.onOffSwitch.visibleProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.onOffSwitch.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -7021,7 +7021,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.opacityProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -7034,7 +7034,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.pickableProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand All @@ -7047,7 +7047,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
},
"balancingAct.introScreen.view.columnControlPanel.abSwitch.visibleProperty": {
"balancingAct.introScreen.view.columnControlPanel.columnSwitch.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
Expand Down

0 comments on commit ea7ca11

Please sign in to comment.