From e0ec01fe7e46072dae7f456a7e4ed7d2debd45f2 Mon Sep 17 00:00:00 2001 From: zepumph Date: Thu, 17 Oct 2019 14:35:21 -0800 Subject: [PATCH] convert _.extend to PHET_CORE/merge, https://github.com/phetsims/phet-core/issues/71 --- js/common/model/PointController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/common/model/PointController.js b/js/common/model/PointController.js index e4b2d6e..252aaf4 100644 --- a/js/common/model/PointController.js +++ b/js/common/model/PointController.js @@ -15,6 +15,7 @@ define( require => { const Animation = require( 'TWIXT/Animation' ); const BooleanProperty = require( 'AXON/BooleanProperty' ); const Easing = require( 'TWIXT/Easing' ); + const merge = require( 'PHET_CORE/merge' ); const numberLineIntegers = require( 'NUMBER_LINE_INTEGERS/numberLineIntegers' ); const NumberLinePoint = require( 'NUMBER_LINE_INTEGERS/common/model/NumberLinePoint' ); const NumberProperty = require( 'AXON/NumberProperty' ); @@ -33,7 +34,7 @@ define( require => { */ constructor( options ) { - options = _.extend( { + options = merge( { // color used when represented in the view color: 'black',