From 1bb172a618c91697060ba6324ee34490d1e74d52 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/NumberLine.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/common/model/NumberLine.js b/js/common/model/NumberLine.js index 4f6d0e3..734d80f 100644 --- a/js/common/model/NumberLine.js +++ b/js/common/model/NumberLine.js @@ -13,6 +13,7 @@ define( require => { // modules const BooleanProperty = require( 'AXON/BooleanProperty' ); const Bounds2 = require( 'DOT/Bounds2' ); + const merge = require( 'PHET_CORE/merge' ); const numberLineIntegers = require( 'NUMBER_LINE_INTEGERS/numberLineIntegers' ); const NumberLineOrientation = require( 'NUMBER_LINE_INTEGERS/common/model/NumberLineOrientation' ); const NumberLinePoint = require( 'NUMBER_LINE_INTEGERS/common/model/NumberLinePoint' ); @@ -43,7 +44,7 @@ define( require => { */ constructor( zeroPosition, options ) { - options = _.extend( { + options = merge( { // {string} - whether the number line is initially oriented in the horizontal or vertical direction initialOrientation: NumberLineOrientation.HORIZONTAL,