Set Property to default to reentrant: false and specify overrides for…

… reentrant Property instances, see phetsims/axon#179
phetsims · Aug 21, 2018 · d9d3e8f · d9d3e8f
1 parent 894ba5e
commit d9d3e8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/js/mysolution/model/MySolutionModel.js b/js/mysolution/model/MySolutionModel.js
@@ -48,10 +48,14 @@ define( function( require ) {
      */
 
     // @public convenience Property that will synchronize with the concentration the currently selected solution
-    this.concentrationProperty = new Property( this.solutions[ DEFAULT_SOLUTION_TYPE ].concentrationProperty.get() );
+    this.concentrationProperty = new Property( this.solutions[ DEFAULT_SOLUTION_TYPE ].concentrationProperty.get(), {
+      reentrant: true
+    } );
 
     // @public convenience Property that will synchronize with the strength of the currently selected solution
-    this.strengthProperty = new Property( this.solutions[ DEFAULT_SOLUTION_TYPE ].strengthProperty.get() );
+    this.strengthProperty = new Property( this.solutions[ DEFAULT_SOLUTION_TYPE ].strengthProperty.get(), {
+      reentrant: true
+    } );
 
     var setStrength = function( value ) { self.strengthProperty.set( value ); };
     var setConcentration = function( value ) { self.concentrationProperty.set( value ); };

diff --git a/js/mysolution/view/ConcentrationSlider.js b/js/mysolution/view/ConcentrationSlider.js
@@ -66,7 +66,9 @@ define( function( require ) {
     this.sliderValueRange = new RangeWithValue( Util.log10( concentrationRange.min ), Util.log10( concentrationRange.max ), Util.log10( concentrationRange.defaultValue ) );
 
     // @public property for slider value
-    this.sliderValueProperty = new Property( Util.log10( concentrationProperty.get() ) );
+    this.sliderValueProperty = new Property( Util.log10( concentrationProperty.get() ), {
+      reentrant: true
+    } );
 
     this.sliderValueProperty.link( function( sliderValue ) {
       self.concentrationProperty.set( Util.toFixedNumber( Math.pow( 10, sliderValue ), 10 ) ); // see issue#73

diff --git a/js/mysolution/view/StrengthSlider.js b/js/mysolution/view/StrengthSlider.js
@@ -73,7 +73,9 @@ define( function( require ) {
     this.sliderValueRange = new RangeWithValue( Util.log10( strengthRange.min ), Util.log10( strengthRange.max ), Util.log10( strengthRange.defaultValue ) );
 
     // @public slider's value
-    this.sliderValueProperty = new Property( Util.log10( strengthProperty.get() ) );
+    this.sliderValueProperty = new Property( Util.log10( strengthProperty.get() ), {
+      reentrant: true
+    } );
 
     // map between linear and logarithmic
     this.sliderValueProperty.link( function( sliderValue ) {