convert _.extend to merge in zepumph responsible sims, phetsims/phet-…

…core#71
phetsims · Oct 11, 2019 · 6a637a5 · 6a637a5
1 parent 9f207bd
commit 6a637a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/js/molarity/model/Solute.js b/js/molarity/model/Solute.js
@@ -12,6 +12,7 @@ define( require => {
 
   // modules
   const inherit = require( 'PHET_CORE/inherit' );
+  const merge = require( 'PHET_CORE/merge' );
   const molarity = require( 'MOLARITY/molarity' );
   const PhetioObject = require( 'TANDEM/PhetioObject' );
   const SoluteIO = require( 'MOLARITY/molarity/model/SoluteIO' );
@@ -27,7 +28,7 @@ define( require => {
    */
   function Solute( name, formula, saturatedConcentration, minColor, maxColor, options ) {
 
-    options = _.extend( {
+    options = merge( {
       particleColor: maxColor, // the solute's color as a particle
       phetioType: SoluteIO
     }, options );

diff --git a/js/molarity/view/PrecipitateSoundGenerator.js b/js/molarity/view/PrecipitateSoundGenerator.js
@@ -10,9 +10,10 @@ define( require => {
 
   // modules
   const BinMapper = require( 'TAMBO/BinMapper' );
+  const merge = require( 'PHET_CORE/merge' );
   const molarity = require( 'MOLARITY/molarity' );
-  const SoundClip = require( 'TAMBO/sound-generators/SoundClip' );
   const Range = require( 'DOT/Range' );
+  const SoundClip = require( 'TAMBO/sound-generators/SoundClip' );
 
   // sounds
   const precipitateSound = require( 'sound!MOLARITY/precipitate.mp3' );
@@ -42,7 +43,7 @@ define( require => {
      */
     constructor( precipitateAmountProperty, soluteAmountSlider, solutionVolumeSlider, options ) {
 
-      super( precipitateSound, _.extend( {
+      super( precipitateSound, merge( {
         initialOutputLevel: 0.5,
         rateChangesAffectPlayingSounds: false
       }, options ) );

diff --git a/js/molarity/view/SoluteComboBox.js b/js/molarity/view/SoluteComboBox.js
@@ -12,6 +12,7 @@ define( require => {
   const ComboBox = require( 'SUN/ComboBox' );
   const ComboBoxItem = require( 'SUN/ComboBoxItem' );
   const HBox = require( 'SCENERY/nodes/HBox' );
+  const merge = require( 'PHET_CORE/merge' );
   const molarity = require( 'MOLARITY/molarity' );
   const MolarityA11yStrings = require( 'MOLARITY/molarity/MolarityA11yStrings' );
   const PhetFont = require( 'SCENERY_PHET/PhetFont' );
@@ -42,7 +43,7 @@ define( require => {
      */
     constructor( solutes, selectedSoluteProperty, listParent, tandem, options ) {
 
-      options = _.extend( {
+      options = merge( {
         labelNode: new Text( StringUtils.format( pattern0LabelString, soluteString ), { font: new PhetFont( 22 ) } ), // 'Solute' label
         listPosition: 'above',
         cornerRadius: 8,