Skip to content

Commit

Permalink
convert 2 usages of emit1 to emit, add support for type checks via in…
Browse files Browse the repository at this point in the history
…stanceof, phetsims/axon#182
  • Loading branch information
zepumph committed Oct 5, 2018
1 parent d6ae1f4 commit e2868a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions js/model/Atom2.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ define( function( require ) {
this.addedToModelProperty = new BooleanProperty( true );

// @public {Emitter} - Called with one parameter: particle
this.grabbedByUserEmitter = new Emitter();
this.droppedByUserEmitter = new Emitter();
this.grabbedByUserEmitter = new Emitter( { validValues: [ Atom2 ] } );
this.droppedByUserEmitter = new Emitter( { validValues: [ Atom2 ] } );
this.removedFromModelEmitter = new Emitter(); //REVIEW: Umm, not triggered?

this.tickEmitter = tickEmitter;
Expand All @@ -48,10 +48,10 @@ define( function( require ) {

this.userControlledProperty.lazyLink( function( controlled ) {
if ( controlled ) {
self.grabbedByUserEmitter.emit1( self );
self.grabbedByUserEmitter.emit( self );
}
else {
self.droppedByUserEmitter.emit1( self );
self.droppedByUserEmitter.emit( self );
}
} );

Expand Down
4 changes: 2 additions & 2 deletions js/screens/BAMScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ define( function( require ) {
}, options );

var createModel = function() {
var tickEmitter = new Emitter(); // emits 1 parameter, timeElapsed
var tickEmitter = new Emitter( { validValues: [ 'number' ] } ); // emits 1 parameter, timeElapsed
var model = new CollectionList( createInitialKitCollection( layoutBounds, tickEmitter ), layoutBounds, tickEmitter );
model.step = function step( timeElapsed ) {
tickEmitter.emit1( timeElapsed );
Expand All @@ -41,7 +41,7 @@ define( function( require ) {
return model;
};

Screen.call( this,createModel, createView, options );
Screen.call( this, createModel, createView, options );
}

buildAMolecule.register( 'BAMScreen', BAMScreen );
Expand Down

0 comments on commit e2868a4

Please sign in to comment.