dragBounds => dragBoundsProperty, see phetsims/scenery#131

phetsims · Apr 26, 2018 · 0ff3618 · 0ff3618
1 parent 9493cf2
commit 0ff3618
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/js/charges-and-fields/view/ChargedParticleNode.js b/js/charges-and-fields/view/ChargedParticleNode.js
@@ -56,7 +56,7 @@ define( function( require ) {
       applyOffset: false,
       locationProperty: chargedParticle.positionProperty,
       tandem: tandem.createTandem( 'dragListener' ),
-      dragBounds: availableModelBoundsProperty.get(),
+      dragBoundsProperty: availableModelBoundsProperty,
       transform: modelViewTransform,
       canStartPress: function() { return !chargedParticle.animationTween; },
       isUserControlledProperty: chargedParticle.isUserControlledProperty,
@@ -76,10 +76,6 @@ define( function( require ) {
       }
     } );
 
-    // readjust the dragBounds of the movable drag handler when the screen is resized
-    var dragBoundsListener = self.movableDragHandler.setDragBounds.bind( self.movableDragHandler );
-    availableModelBoundsProperty.link( dragBoundsListener );
-
     // Conditionally hook up the input handling (and cursor) when the charged particle is interactive.
     var isDragListenerAttached = false;
 
@@ -103,7 +99,6 @@ define( function( require ) {
     chargedParticle.isInteractiveProperty.link( isInteractiveListener );
 
     this.disposeChargedParticleNode = function() {
-      availableModelBoundsProperty.unlink( dragBoundsListener );
       chargedParticle.positionProperty.unlink( positionListener );
       chargedParticle.isInteractiveProperty.unlink( isInteractiveListener );
       this.movableDragHandler.dispose();

diff --git a/js/charges-and-fields/view/ElectricFieldSensorNode.js b/js/charges-and-fields/view/ElectricFieldSensorNode.js
@@ -192,7 +192,7 @@ define( function( require ) {
       applyOffset: false,
       locationProperty: electricFieldSensor.positionProperty,
       tandem: tandem.createTandem( 'dragListener' ),
-      dragBounds: availableModelBoundsProperty.value,
+      dragBoundsProperty: availableModelBoundsProperty,
       transform: modelViewTransform,
       canStartPress: function() { return !electricFieldSensor.animationTween; },
       isUserControlledProperty: electricFieldSensor.isUserControlledProperty,
@@ -238,12 +238,6 @@ define( function( require ) {
     };
     electricFieldSensor.isInteractiveProperty.link( isInteractiveListener );
 
-    var availableModelBoundsPropertyListener = function( bounds ) {
-      self.movableDragHandler.setDragBounds( bounds );
-    };
-
-    availableModelBoundsProperty.link( availableModelBoundsPropertyListener );
-
     this.availableModelBoundsProperty = availableModelBoundsProperty;
 
     this.disposeElectricFieldSensorNode = function() {
@@ -256,7 +250,6 @@ define( function( require ) {
       isPlayAreaChargedProperty.unlink( isPlayAreaChargedListener );
       isDirectionLabelVisibleDerivedProperty.unlink( isDirectionLabelVisibleListener );
       isDirectionLabelVisibleDerivedProperty.dispose();
-      availableModelBoundsProperty.unlink( availableModelBoundsPropertyListener );
       this.movableDragHandler.dispose();
       fieldStrengthLabel.dispose();
       directionLabel.dispose();

diff --git a/js/charges-and-fields/view/ElectricPotentialSensorNode.js b/js/charges-and-fields/view/ElectricPotentialSensorNode.js
@@ -256,7 +256,7 @@ define( function( require ) {
     this.movableDragHandler = new DragListener( {
       locationProperty: electricPotentialSensor.positionProperty,
       tandem: tandem.createTandem( 'dragListener' ),
-      dragBounds: availableModelBoundsProperty.get(),
+      dragBoundsProperty: availableModelBoundsProperty,
       transform: modelViewTransform,
       isUserControlledProperty: this.isUserControlledProperty,
       end: function( event, listener ) {
@@ -267,11 +267,6 @@ define( function( require ) {
     // When dragging, move the electric potential sensor
     self.addInputListener( this.movableDragHandler );
 
-    //no need to unlink, the sensor is present for the lifetime of the simulation.
-    availableModelBoundsProperty.link( function( bounds ) {
-      self.movableDragHandler.setDragBounds( bounds );
-    } );
-
     // Show/Hide this node
     // no need to unlink, stays for the lifetime of the simulation
     electricPotentialSensor.isActiveProperty.linkAttribute( this, 'visible' );