convert {null|*} from isValidValue function to valueType: [null, *], p…

…hetsims/axon#228
phetsims · Jul 19, 2019 · 5271f02 · 5271f02
1 parent cf0a526
commit 5271f02
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/js/common/model/GQModel.js b/js/common/model/GQModel.js
@@ -46,7 +46,7 @@ define( require => {
 
       // @public {Property.<Quadratic|null>} the saved quadratic, null if nothing is saved
       this.savedQuadraticProperty = new Property( null, {
-        isValidValue: value => ( value instanceof Quadratic || value === null ),
+        valueType: [ Quadratic, null ],
         tandem: tandem.createTandem( 'savedQuadraticProperty' ),
         phetioDocumentation: 'the saved quadratic, null if there is no saved quadratic',
         phetioType: PropertyIO( NullableIO( QuadraticIO ) )

diff --git a/js/common/model/PointTool.js b/js/common/model/PointTool.js
@@ -67,7 +67,7 @@ define( require => {
             return null;
           }
         }, {
-          isValidValue: value => ( value instanceof Quadratic || value === null ),
+          valueType: [ Quadratic, null ],
           tandem: options.tandem.createTandem( 'onQuadraticProperty' ),
           phetioDocumentation: 'the quadratic that this point tool is on, null if not on a quadratic',
           phetioType: DerivedPropertyIO( NullableIO( QuadraticIO ) )

diff --git a/js/common/view/PointToolNode.js b/js/common/view/PointToolNode.js
@@ -65,7 +65,7 @@ define( require => {
 
       const coordinatesProperty = new DerivedProperty( [ pointTool.locationProperty ],
         location => ( graph.contains( location ) ? location : null ), {
-          isValidValue: value => ( value instanceof Vector2 || value === null )
+          valueType: [ Vector2, null ]
         } );
 
       // coordinates display

diff --git a/js/common/view/VertexManipulator.js b/js/common/view/VertexManipulator.js
@@ -73,7 +73,7 @@ define( require => {
       // coordinates correspond to the quadratic's vertex (if it has one)
       const coordinatesProperty = new DerivedProperty( [ quadraticProperty ],
         quadratic => ( quadratic.vertex ? quadratic.vertex : null ), {
-          isValidValue: value => ( value instanceof Vector2 || value === null ),
+          valueType: [ Vector2, null ],
           tandem: options.tandem.createTandem( 'coordinatesProperty' ),
           phetioDocumentation: 'coordinates displayed by on vertex manipulator, null means no vertex',
           phetioType: DerivedPropertyIO( NullableIO( Vector2IO ) )

diff --git a/js/standardform/view/RootsNode.js b/js/standardform/view/RootsNode.js
@@ -47,13 +47,13 @@ define( require => {
 
       // options common to both Property instances
       const coordinatesPropertyOptions = {
-        isValidValue: value => ( value instanceof Vector2 || value === null ),
+        valueType: [ Vector2, null ],
         phetioType: DerivedPropertyIO( NullableIO( Vector2IO ) )
       };
 
       // coordinates corresponding to the quadratic's left or single root (if it has roots)
       const leftCoordinatesProperty = new DerivedProperty( [ quadraticProperty ],
-        quadratic => ( quadratic.roots && quadratic.roots.length > 0 ) ? quadratic.roots[ 0 ] : null, 
+        quadratic => ( quadratic.roots && quadratic.roots.length > 0 ) ? quadratic.roots[ 0 ] : null,
         _.extend( {}, coordinatesPropertyOptions, {
           tandem: options.tandem.createTandem( 'leftCoordinatesProperty' ),
           phetioDocumentation: 'coordinates displayed on the left (first) root, ' +
@@ -62,7 +62,7 @@ define( require => {
 
       // coordinates corresponding to the quadratic's right root, if it has 2 roots
       const rightCoordinatesProperty = new DerivedProperty( [ quadraticProperty ],
-        quadratic => ( quadratic.roots && quadratic.roots.length === 2 ) ? quadratic.roots[ 1 ] : null, 
+        quadratic => ( quadratic.roots && quadratic.roots.length === 2 ) ? quadratic.roots[ 1 ] : null,
         _.extend( {}, coordinatesPropertyOptions, {
           tandem: options.tandem.createTandem( 'rightCoordinatesProperty' ),
           phetioDocumentation: 'coordinates displayed on the right (second) root, ' +
@@ -78,7 +78,7 @@ define( require => {
         x: modelViewTransform.modelToViewX( graph.xRange.getCenter() ),
         y: modelViewTransform.modelToViewY( graph.yRange.getCenter() )
       };
-      
+
       // left root
       const leftRootNode = new PointNode( leftCoordinatesProperty, coordinatesVisibleProperty,
         _.extend( {}, pointNodeOptions, {

diff --git a/js/standardform/view/VertexNode.js b/js/standardform/view/VertexNode.js
@@ -65,7 +65,7 @@ define( require => {
       // coordinates correspond to the quadratic's vertex (if it has one)
       const coordinatesProperty = new DerivedProperty( [ quadraticProperty ],
         quadratic => ( quadratic.vertex ? quadratic.vertex : null ), {
-          isValidValue: value => ( value instanceof Vector2 || value === null ),
+          valueType: [ Vector2, null ],
           tandem: options.tandem.createTandem( 'coordinatesProperty' ),
           phetioDocumentation: 'coordinates displayed on the vertex point, null means no vertex',
           phetioType: DerivedPropertyIO( NullableIO( Vector2IO ) )