From b5cdac135f3c15a3aa63ef553934841f3f2c3aac Mon Sep 17 00:00:00 2001 From: zepumph Date: Wed, 27 Feb 2019 13:46:18 -0900 Subject: [PATCH] remove emit1(), use emit() instead, https://github.com/phetsims/axon/issues/211 --- js/make-a-ten/common/model/PaperNumber.js | 6 +++--- js/make-a-ten/common/view/PaperNumberNode.js | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/make-a-ten/common/model/PaperNumber.js b/js/make-a-ten/common/model/PaperNumber.js index be1383c..357204f 100644 --- a/js/make-a-ten/common/model/PaperNumber.js +++ b/js/make-a-ten/common/model/PaperNumber.js @@ -58,10 +58,10 @@ define( function( require ) { this.baseNumbers = PaperNumber.getBaseNumbers( this.numberValueProperty.value ); // @public {Emitter} - Fires when the user stops dragging a paper number. - this.endDragEmitter = new Emitter(); + this.endDragEmitter = new Emitter( { validationEnabled: false } ); // @public {Emitter} - Fires when the animation towards our destination ends (we hit our destination). - this.endAnimationEmitter = new Emitter(); + this.endAnimationEmitter = new Emitter( { validationEnabled: false } ); } makeATen.register( 'PaperNumber', PaperNumber ); @@ -92,7 +92,7 @@ define( function( require ) { // Less than one time step away, so just go to the destination. this.positionProperty.value = this.destination; this.animating = false; - this.endAnimationEmitter.emit1( this ); + this.endAnimationEmitter.emit( this ); } } }, diff --git a/js/make-a-ten/common/view/PaperNumberNode.js b/js/make-a-ten/common/view/PaperNumberNode.js index 1a91ef5..3e35ab3 100644 --- a/js/make-a-ten/common/view/PaperNumberNode.js +++ b/js/make-a-ten/common/view/PaperNumberNode.js @@ -38,13 +38,13 @@ define( function( require ) { this.paperNumber = paperNumber; // @public {Emitter} - Triggered with self when this paper number node starts to get dragged - this.moveEmitter = new Emitter(); + this.moveEmitter = new Emitter( { validationEnabled: false } ); // @public {Emitter} - Triggered with self when this paper number node is split - this.splitEmitter = new Emitter(); + this.splitEmitter = new Emitter( { validationEnabled: false } ); // @public {Emitter} - Triggered when user interaction with this paper number begins. - this.interactionStartedEmitter = new Emitter(); + this.interactionStartedEmitter = new Emitter( { validationEnabled: false } ); // @private {boolean} - When true, don't emit from the moveEmitter (synthetic drag) this.preventMoveEmit = false; @@ -76,9 +76,9 @@ define( function( require ) { this.moveDragHandler = new DragListener( { targetNode: this, start: function( event, listener ) { - self.interactionStartedEmitter.emit1( self ); + self.interactionStartedEmitter.emit( self ); if ( !self.preventMoveEmit ) { - self.moveEmitter.emit1( self ); + self.moveEmitter.emit( self ); } }, @@ -88,7 +88,7 @@ define( function( require ) { end: function( event, listener ) { tryToCombineNumbers( self.paperNumber ); - paperNumber.endDragEmitter.emit1( paperNumber ); + paperNumber.endDragEmitter.emit( paperNumber ); } } ); this.moveDragHandler.isUserControlledProperty.link( function( controlled ) { @@ -116,8 +116,8 @@ define( function( require ) { paperNumber.changeNumber( amountRemaining ); - self.interactionStartedEmitter.emit1( self ); - self.splitEmitter.emit1( self ); + self.interactionStartedEmitter.emit( self ); + self.splitEmitter.emit( self ); var newPaperNumber = new PaperNumber( amountToRemove, paperNumber.positionProperty.value ); addAndDragNumber( event, newPaperNumber ); @@ -178,7 +178,7 @@ define( function( require ) { } // Changing the number must have happened from an interaction. If combined, we want to put cues on this. - this.interactionStartedEmitter.emit1( this ); + this.interactionStartedEmitter.emit( this ); }, /**