Added support for mutable componentIDs for arch data streams

phetsims · Mar 6, 2015 · 93d8dbb · 93d8dbb
1 parent c2e3487
commit 93d8dbb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/js/RadioButton.js b/js/RadioButton.js
@@ -26,9 +26,12 @@ define( function( require ) {
 
     options = _.extend( {
       cursor: 'pointer',
-      focusable: true
+      focusable: true,
+      componentID: null
     }, options );
 
+    this.componentID = options.componentID;
+
     var thisNode = this;
     Node.call( thisNode );
 
@@ -49,7 +52,7 @@ define( function( require ) {
     // set property value on fire
     thisNode.addInputListener( new ButtonListener( {
       fire: function() {
-        var archID = arch && arch.start( 'user', options.componentID, 'radioButton', 'fire', { value: value } );
+        var archID = arch && arch.start( 'user', thisNode.componentID, thisNode.componentType, 'fire', { value: value } );
         property.set( value );
         arch && arch.end( archID );
       }

diff --git a/js/buttons/PushButtonModel.js b/js/buttons/PushButtonModel.js
@@ -22,9 +22,12 @@ define( function( require ) {
 
     options = _.extend( {
       fireOnDown: false, // true: fire on pointer down; false: fire on pointer up if pointer is over button
-      listener: null
+      listener: null,
+      componentID: null
     }, options );
 
+    this.componentID = options.componentID;
+
     ButtonModel.call( this );
 
     this.listeners = []; //@private
@@ -67,7 +70,7 @@ define( function( require ) {
     // Fires all listeners.
     // @private with the possible exception of hooking up for accessibility.
     fire: function() {
-      var archID = arch && arch.start( 'user', this.componentID, 'button', 'fire' );
+      var archID = arch && arch.start( 'user', this.componentID, this.componentType, 'fire' );
       var copy = this.listeners.slice( 0 );
       copy.forEach( function( listener ) {
         listener();

diff --git a/js/buttons/RoundPushButton.js b/js/buttons/RoundPushButton.js
@@ -59,6 +59,13 @@ define( function( require ) {
   }
 
   return inherit( RoundButtonView, RoundPushButton, {
+
+    set componentID( c ) {
+      this.buttonModel.componentID = c;
+    },
+    set componentType( c ) {
+      this.buttonModel.componentType = c;
+    },
     addListener: function( listener ) {
       this.buttonModel.addListener( listener );
     },