never overwrite default options, instrument all numberDisplays, #177

phetsims · Oct 11, 2019 · e33e2ec · e33e2ec
1 parent 8eee80a
commit e33e2ec
Show file tree

Hide file tree

Showing 4 changed files with 695 additions and 46 deletions.
diff --git a/js/common/view/TargetNode.js b/js/common/view/TargetNode.js
@@ -14,6 +14,7 @@ define( require => {
   const Circle = require( 'SCENERY/nodes/Circle' );
   const Easing = require( 'TWIXT/Easing' );
   const inherit = require( 'PHET_CORE/inherit' );
+  const merge = require( 'PHET_CORE/merge' );
   const Node = require( 'SCENERY/nodes/Node' );
   const NumberDisplay = require( 'SCENERY_PHET/NumberDisplay' );
   const projectileMotion = require( 'PROJECTILE_MOTION/projectileMotion' );
@@ -128,14 +129,14 @@ define( require => {
         transformProperty.get().viewToModelX( screenView.layoutBounds.minX ),
         transformProperty.get().viewToModelX( screenView.layoutBounds.maxX )
       ),
-      _.extend(
-        ProjectileMotionConstants.NUMBER_DISPLAY_OPTIONS, {
+      merge( {}, ProjectileMotionConstants.NUMBER_DISPLAY_OPTIONS, {
           numberFill: 'black',
           valuePattern: distancePattern,
           xMargin: 10.5,
           yMargin: 2,
           decimalPlaces: 1,
-          cursor: 'pointer'
+          cursor: 'pointer',
+          tandem: tandem.createTandem( 'numberDisplay' )
         }
       )
     );

diff --git a/js/drag/view/DragProjectilePanel.js b/js/drag/view/DragProjectilePanel.js
@@ -91,12 +91,11 @@ define( require => {
       const numberDisplay = new NumberDisplay(
         valueProperty,
         range,
-        _.extend(
-          ProjectileMotionConstants.NUMBER_DISPLAY_OPTIONS, {
-            valuePattern: StringUtils.fillIn( pattern0Value1UnitsWithSpaceString, { units: unitsString } ),
-            decimalPlaces: null,
-            tandem: tandem.createTandem( 'numberDisplay' )
-          } )
+        merge( {}, ProjectileMotionConstants.NUMBER_DISPLAY_OPTIONS, {
+          valuePattern: StringUtils.fillIn( pattern0Value1UnitsWithSpaceString, { units: unitsString } ),
+          decimalPlaces: null,
+          tandem: tandem.createTandem( 'numberDisplay' )
+        } )
       );
 
       const slider = new HSlider( valueProperty, range, {