Skip to content

Commit

Permalink
1.3 patch for #114 and #117
Browse files Browse the repository at this point in the history
  • Loading branch information
pixelzoom committed Feb 18, 2019
1 parent f729e7d commit 12eb7c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions js/pointslope/view/PointSlopeEquationNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,7 @@ define( function( require ) {
x1Node = new DynamicValueNode( x1Property, _.extend( { absoluteValue: true }, staticOptions ) );
}
var xRightParenNode = new Text( ')', staticOptions );
var slopeUndefinedNode = new RichText( '?', _.extend( {}, staticOptions, {
maxWidth: options.maxWidth // see #114
} ) );
var slopeUndefinedNode = new RichText( '?', staticOptions );

// add all nodes, we'll set which ones are visible bases on desired simplification
self.children = [
Expand All @@ -174,7 +172,7 @@ define( function( require ) {
self.children[ i ].visible = false;
self.children[ i ].x = 0;
}
slopeUndefinedNode.text = ''; // workaround for #117
slopeUndefinedNode.text = ''; // workaround for #114 and #117

if ( line.undefinedSlope() && !interactive ) {
// slope is undefined and nothing is interactive
Expand Down
6 changes: 2 additions & 4 deletions js/slopeintercept/view/SlopeInterceptEquationNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ define( function( require ) {
}
var yInterceptDenominatorNode = new DynamicValueNode( yInterceptDenominatorProperty, _.extend( { absoluteValue: true }, staticOptions ) );
var yInterceptFractionLineNode = new scenery.Line( 0, 0, maxSlopePickerWidth, 0, fractionLineOptions );
var slopeUndefinedNode = new RichText( '?', _.extend( {}, staticOptions, {
maxWidth: options.maxWidth // see #114
} ) );
var slopeUndefinedNode = new RichText( '?', staticOptions );

// add all nodes, we'll set which ones are visible bases on desired simplification
self.children = [ yNode, equalsNode, slopeMinusSignNode, riseNode, runNode, slopeFractionLineNode, xNode, plusNode, minusNode,
Expand All @@ -164,7 +162,7 @@ define( function( require ) {
self.children[ i ].visible = false;
self.children[ i ].x = 0;
}
slopeUndefinedNode.text = ''; // workaround for #117
slopeUndefinedNode.text = ''; // workaround for #114 and #117

if ( line.undefinedSlope() && !interactive ) {
// slope is undefined and nothing is interactive
Expand Down

0 comments on commit 12eb7c4

Please sign in to comment.