Skip to content

Commit

Permalink
reformat NumberPicker options, #124
Browse files Browse the repository at this point in the history
  • Loading branch information
pixelzoom committed Feb 14, 2019
1 parent cc85f56 commit 237b440
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
18 changes: 10 additions & 8 deletions js/pointslope/view/PointSlopeEquationNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,11 @@ define( function( require ) {
var yMinusNode = new MinusNode( _.extend( { size: self.operatorLineSize }, staticOptions ) );
var y1Node;
if ( options.interactivePoint ) {
y1Node = new NumberPicker( y1Property, options.y1RangeProperty,
{ color: GLColors.POINT_X1_Y1, font: interactiveFont, touchAreaXDilation: 30 } );
y1Node = new NumberPicker( y1Property, options.y1RangeProperty, {
color: GLColors.POINT_X1_Y1,
font: interactiveFont,
touchAreaXDilation: 30
} );
}
else {
y1Node = new DynamicValueNode( y1Property, _.extend( { absoluteValue: true }, staticOptions ) );
Expand All @@ -135,12 +138,11 @@ define( function( require ) {
var xMinusNode = new MinusNode( _.extend( { size: self.operatorLineSize }, staticOptions ) );
var x1Node;
if ( options.interactivePoint ) {
x1Node = new NumberPicker( x1Property, options.x1RangeProperty,
{
color: GLColors.POINT_X1_Y1,
font: interactiveFont,
touchAreaXDilation: GLConstants.PICKER_TOUCH_AREA_X_DILATION
} );
x1Node = new NumberPicker( x1Property, options.x1RangeProperty, {
color: GLColors.POINT_X1_Y1,
font: interactiveFont,
touchAreaXDilation: GLConstants.PICKER_TOUCH_AREA_X_DILATION
} );
}
else {
x1Node = new DynamicValueNode( x1Property, _.extend( { absoluteValue: true }, staticOptions ) );
Expand Down
11 changes: 5 additions & 6 deletions js/slopeintercept/view/SlopeInterceptEquationNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,11 @@ define( function( require ) {
}, staticOptions ) );
var yInterceptNumeratorNode; // also used for integer values
if ( options.interactiveIntercept ) {
yInterceptNumeratorNode = new NumberPicker( yInterceptProperty, options.yInterceptRangeProperty,
{
color: GLColors.INTERCEPT,
font: interactiveFont,
touchAreaXDilation: GLConstants.PICKER_TOUCH_AREA_X_DILATION
} );
yInterceptNumeratorNode = new NumberPicker( yInterceptProperty, options.yInterceptRangeProperty, {
color: GLColors.INTERCEPT,
font: interactiveFont,
touchAreaXDilation: GLConstants.PICKER_TOUCH_AREA_X_DILATION
} );
}
else {
yInterceptNumeratorNode = new DynamicValueNode( yInterceptNumeratorProperty, _.extend( { absoluteValue: true }, staticOptions ) );
Expand Down

0 comments on commit 237b440

Please sign in to comment.