diff --git a/js/resistance-in-a-wire/view/ControlPanel.js b/js/resistance-in-a-wire/view/ControlPanel.js index f66ceb6..7f66dd5 100644 --- a/js/resistance-in-a-wire/view/ControlPanel.js +++ b/js/resistance-in-a-wire/view/ControlPanel.js @@ -11,6 +11,7 @@ define( require => { // modules const inherit = require( 'PHET_CORE/inherit' ); + const merge = require( 'PHET_CORE/merge' ); const Node = require( 'SCENERY/nodes/Node' ); const Panel = require( 'SUN/Panel' ); const resistanceInAWire = require( 'RESISTANCE_IN_A_WIRE/resistanceInAWire' ); @@ -32,12 +33,12 @@ define( require => { const cmString = require( 'string!RESISTANCE_IN_A_WIRE/cm' ); const lengthString = require( 'string!RESISTANCE_IN_A_WIRE/length' ); const lengthSymbolString = require( 'string!RESISTANCE_IN_A_WIRE/lengthSymbol' ); - const symbolOhmsString = require( 'string!SCENERY_PHET/symbol.ohms' ); const ohmString = require( 'string!RESISTANCE_IN_A_WIRE/ohm' ); const pattern0Label1Value2UnitsString = require( 'string!RESISTANCE_IN_A_WIRE/pattern.0label.1value.2units' ); const pattern0ResistanceUnits1LengthUnitsString = require( 'string!RESISTANCE_IN_A_WIRE/pattern.0resistanceUnits.1lengthUnits' ); const resistanceString = require( 'string!RESISTANCE_IN_A_WIRE/resistance' ); const resistivityString = require( 'string!RESISTANCE_IN_A_WIRE/resistivity' ); + const symbolOhmsString = require( 'string!SCENERY_PHET/symbol.ohms' ); const symbolResistivityString = require( 'string!SCENERY_PHET/symbol.resistivity' ); // a11y strings (not ready for i18n) @@ -73,7 +74,7 @@ define( require => { */ function ControlPanel( model, tandem, options ) { - options = _.extend( { + options = merge( { xMargin: 30, yMargin: 20, lineWidth: 3, diff --git a/js/resistance-in-a-wire/view/DotsCanvasNode.js b/js/resistance-in-a-wire/view/DotsCanvasNode.js index 9f591eb..9bde91b 100644 --- a/js/resistance-in-a-wire/view/DotsCanvasNode.js +++ b/js/resistance-in-a-wire/view/DotsCanvasNode.js @@ -15,6 +15,7 @@ define( require => { const CanvasNode = require( 'SCENERY/nodes/CanvasNode' ); const inherit = require( 'PHET_CORE/inherit' ); const LinearFunction = require( 'DOT/LinearFunction' ); + const merge = require( 'PHET_CORE/merge' ); const resistanceInAWire = require( 'RESISTANCE_IN_A_WIRE/resistanceInAWire' ); const ResistanceInAWireConstants = require( 'RESISTANCE_IN_A_WIRE/resistance-in-a-wire/ResistanceInAWireConstants' ); const Vector2 = require( 'DOT/Vector2' ); @@ -42,7 +43,7 @@ define( require => { */ function DotsCanvasNode( model, options ) { - options = _.extend( { + options = merge( { preventFit: true // don't recompute bounds as a performance enhancement }, options );