Skip to content

Commit

Permalink
Reformat, see #299
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Jun 29, 2020
1 parent c90f92a commit 9921818
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
14 changes: 7 additions & 7 deletions js/atomic-interactions/model/AtomPair.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import AtomType from '../../common/model/AtomType.js';
import statesOfMatter from '../../statesOfMatter.js';

const AtomPair = Enumeration.byMap( {
NEON_NEON: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.NEON },
ARGON_ARGON: { fixedAtomType: AtomType.ARGON, movableAtomType: AtomType.ARGON },
OXYGEN_OXYGEN: { fixedAtomType: AtomType.OXYGEN, movableAtomType: AtomType.OXYGEN },
NEON_ARGON: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.ARGON },
NEON_OXYGEN: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.OXYGEN },
ARGON_OXYGEN: { fixedAtomType: AtomType.ARGON, movableAtomType: AtomType.OXYGEN },
ADJUSTABLE: { fixedAtomType: AtomType.ADJUSTABLE, movableAtomType: AtomType.ADJUSTABLE }
NEON_NEON: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.NEON },
ARGON_ARGON: { fixedAtomType: AtomType.ARGON, movableAtomType: AtomType.ARGON },
OXYGEN_OXYGEN: { fixedAtomType: AtomType.OXYGEN, movableAtomType: AtomType.OXYGEN },
NEON_ARGON: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.ARGON },
NEON_OXYGEN: { fixedAtomType: AtomType.NEON, movableAtomType: AtomType.OXYGEN },
ARGON_OXYGEN: { fixedAtomType: AtomType.ARGON, movableAtomType: AtomType.OXYGEN },
ADJUSTABLE: { fixedAtomType: AtomType.ADJUSTABLE, movableAtomType: AtomType.ADJUSTABLE }
}
);

Expand Down
2 changes: 1 addition & 1 deletion js/atomic-interactions/model/DualAtomModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class DualAtomModel {
tandem: tandem.createTandem( 'adjustableAtomInteractionStrengthProperty' ),
phetioReadOnly: true,
phetioFeatured: true,
units:'K',
units: 'K',
phetioDocumentation: 'intermolecular potential for the "Adjustable Attraction" atoms - this is a parameter in the Lennard-Jones potential equation'
} );

Expand Down
4 changes: 2 additions & 2 deletions js/atomic-interactions/view/AtomicInteractionsControlPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const RADIO_BUTTON_RADIUS = 6;
const TITLE_TEXT_WIDTH = 130;
const PANEL_X_MARGIN = 10;
const SLIDER_VBOX_SPACING = 5;
const AQUA_RADIO_BUTTON_X_SPACING = 8; // only used for atomic-interactions
const AQUA_RADIO_BUTTON_X_SPACING = 8; // only used for atomic-interactions

/**
* @param {DualAtomModel} dualAtomModel - model of the simulation
Expand Down Expand Up @@ -169,7 +169,7 @@ function AtomicInteractionsControlPanel( dualAtomModel, enableHeterogeneousAtoms
neonAndNeonLabelItems[ 0 ].width + neonAndNeonLabelItems[ 1 ].width,
neonAndOxygenLabelItems[ 0 ].width + neonAndOxygenLabelItems[ 1 ].width );
labelWidth = Math.max(
titleText[ 0 ].width * 2,
titleText[ 0 ].width * 2,
titleText[ 1 ].width * 2,
labelWidth, sliderTrackWidth,
options.minWidth - 2 * PANEL_X_MARGIN - 2 * RADIO_BUTTON_RADIUS - AQUA_RADIO_BUTTON_X_SPACING );
Expand Down
8 changes: 4 additions & 4 deletions js/atomic-interactions/view/InteractivePotentialGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ function InteractivePotentialGraph( dualAtomModel, options ) {
this.positionMarker.addInputListener( new DragListener( {
allowTouchSnag: true,

start: event => {
start: event => {
// Stop the particle from moving in the model.
dualAtomModel.setMotionPaused( true );
startDragX = self.positionMarker.globalToParentPoint( event.pointer.point ).x;
},

drag: event => {
drag: event => {

// Make sure the movement hint is now hidden, since the user has figured out what to drag.
dualAtomModel.movementHintVisibleProperty.set( false );
Expand All @@ -215,13 +215,13 @@ function InteractivePotentialGraph( dualAtomModel, options ) {
startDragX = endDragX;
},

end: event => {
end: event => {
// Let the model move the particle again. Note that this happens
// even if the motion was paused by some other means.
dualAtomModel.setMotionPaused( false );
},

tandem: this.positionMarker.tandem.createTandem( 'dragListener' )
tandem: this.positionMarker.tandem.createTandem( 'dragListener' )
}
) );

Expand Down
2 changes: 1 addition & 1 deletion js/common/view/DialGaugeNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function DialGaugeNode( multipleParticleModel, tandem ) {
connectorCollar.centerY = gaugeNode.centerY;
connectorCollar.left = gaugeNode.right - 10;
const dialComponentsNode = new Node( {
children: [ connector, connectorCollar, gaugeNode, readoutNode ]
children: [ connector, connectorCollar, gaugeNode, readoutNode ]
}
);

Expand Down
14 changes: 7 additions & 7 deletions js/phase-changes/view/PhaseChangesMoleculesControlPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ function PhaseChangesMoleculesControlPanel( phaseChangesModel, options ) {

if ( options.showAdjustableAttraction ) {
radioButtonContent.push( {
value: SubstanceType.ADJUSTABLE_ATOM,
node: new SubstanceSelectorNode(
adjustableAttractionSelectorInfo.label,
adjustableAttractionSelectorInfo.icon,
selectorWidth
),
tandemName: 'adjustableAttraction'
value: SubstanceType.ADJUSTABLE_ATOM,
node: new SubstanceSelectorNode(
adjustableAttractionSelectorInfo.label,
adjustableAttractionSelectorInfo.icon,
selectorWidth
),
tandemName: 'adjustableAttraction'
}
);
}
Expand Down

0 comments on commit 9921818

Please sign in to comment.