Instrument "more tools" screen, see #397

phetsims · Feb 10, 2021 · a5b9562 · a5b9562
1 parent f20d694
commit a5b9562
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/js/common/view/LaserNode.js b/js/common/view/LaserNode.js
@@ -220,12 +220,12 @@ class LaserNode extends Node {
     } );
     isTranslationEnabledProperty.lazyLink( isEnabled => {
       if ( isEnabled ) {
-        translationTarget.addInputListener( translationListener );
-        translationTarget.addInputListener( translationOverListener );
+        translationTarget && translationTarget.addInputListener( translationListener );
+        translationTarget && translationTarget.addInputListener( translationOverListener );
       }
       else {
-        translationTarget.removeInputListener( translationListener );
-        translationTarget.removeInputListener( translationOverListener );
+        translationTarget && translationTarget.removeInputListener( translationListener );
+        translationTarget && translationTarget.removeInputListener( translationOverListener );
       }
     } );
 

diff --git a/js/more-tools/MoreToolsScreen.js b/js/more-tools/MoreToolsScreen.js
@@ -34,7 +34,9 @@ class MoreToolsScreen extends Screen {
 
     super(
       () => new MoreToolsModel( tandem.createTandem( 'model' ) ),
-      model => new MoreToolsScreenView( model ),
+      model => new MoreToolsScreenView( model, {
+        tandem: options.tandem.createTandem( 'view' )
+      } ),
       options
     );
   }

diff --git a/js/more-tools/view/MoreToolsScreenView.js b/js/more-tools/view/MoreToolsScreenView.js
@@ -11,6 +11,7 @@
 import Property from '../../../../axon/js/Property.js';
 import Rectangle from '../../../../dot/js/Rectangle.js';
 import Shape from '../../../../kite/js/Shape.js';
+import merge from '../../../../phet-core/js/merge.js';
 import MovableDragHandler from '../../../../scenery-phet/js/input/MovableDragHandler.js';
 import VBox from '../../../../scenery/js/nodes/VBox.js';
 import bendingLight from '../../bendingLight.js';
@@ -28,8 +29,9 @@ class MoreToolsScreenView extends IntroScreenView {
 
   /**
    * @param {MoreToolsModel} moreToolsModel - model of the more tools screen
+   * @param {Object} [options]
    */
-  constructor( moreToolsModel ) {
+  constructor( moreToolsModel, options ) {
 
     super( moreToolsModel,
       true, // hasMoreTools
@@ -43,10 +45,10 @@ class MoreToolsScreenView extends IntroScreenView {
           new LaserTypeAquaRadioButtonGroup( model.laserViewProperty ),
           new WavelengthControl( model.wavelengthProperty, new Property( true ), 120 )
         ]
-      } ), {
+      } ), merge( {
         verticalPlayAreaOffset: 0,
         horizontalPlayAreaOffset: 0
-      } );
+      }, options ) );
 
     this.moreToolsModel = moreToolsModel; // @public (read-only)