Improve strategy for avoiding instrumentation for ButtonNode, see #405

phetsims · Nov 14, 2018 · 0104b1a · 0104b1a
1 parent 44e6838
commit 0104b1a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/js/ComboBox.js b/js/ComboBox.js
@@ -265,9 +265,6 @@ define( require => {
       }
     } );
 
-    let tandem = options.tandem; // don't pass tandem to the ButtonNode
-    delete options.tandem;
-
     // @private button, will be set to correct value when property observer is registered
     // TODO: buttonNode should not get passed all the comboBox options. This seems like a codesmell, see https://github.com/phetsims/sun/issues/314
     this.buttonNode = new ButtonNode( new ComboBoxItemNode( items[ 0 ], itemWidth, itemHeight, options.itemXMargin ), options );
@@ -280,8 +277,6 @@ define( require => {
       thisElementName: AccessiblePeer.PRIMARY_SIBLING
     } );
 
-    options.tandem = tandem; // restore the tandem after passing other options to the ButtonNode
-
     // button interactivity
     this.buttonNode.cursor = 'pointer';
     this.buttonNode.addInputListener( {
@@ -529,6 +524,9 @@ define( require => {
 
       }, options );
 
+      // The ButtonNode is not instrumented
+      delete options.tandem;
+
       super();
 
       this.labelContent = options.a11yButtonLabel;