Additional tiny emitter/property improvements, see #490

js/accessibility/pdom/PDOMInputTests.js

@@ -92,7 +92,7 @@ QUnit.test( 'focusin/focusout (focus/blur)', assert => {
   } );
 
   a.focus();
-  debugger;
+
   assert.ok( aGotFocus, 'a should have been focused' );
   assert.ok( !aLostFocus, 'a should not blur' );
 

js/accessibility/pdom/ParallelDOM.js

@@ -2049,7 +2049,7 @@ const ParallelDOM = {
 
           PDOMTree.accessibleOrderChange( this, oldAccessibleOrder, accessibleOrder );
 
-          this.accessibleOrderEmitter.emit();
+          this.rendererSummaryRefreshEmitter.emit();
         }
       },
       set accessibleOrder( value ) { this.setAccessibleOrder( value ); },
@@ -2633,7 +2633,7 @@ const ParallelDOM = {
         // recompute the heading level for this node if it is using the accessibleHeading API.
         this._accessibleHeading && this.computeHeadingLevel();
 
-        this.accessibleContentEmitter.emit();
+        this.rendererSummaryRefreshEmitter.emit();
       },
 
       /**

js/display/Instance.js

@@ -1441,9 +1441,7 @@ inherit( Object, Instance, {
 
       this.node.opacityProperty.lazyLink( this.markRenderStateDirtyListener );
       this.node.clipAreaProperty.lazyLink( this.markRenderStateDirtyListener );
-      this.node.hintEmitter.addListener( this.markRenderStateDirtyListener );
-      this.node.rendererBitmaskEmitter.addListener( this.markRenderStateDirtyListener );
-      this.node.rendererSummaryEmitter.addListener( this.markRenderStateDirtyListener );
+      this.node.instanceRefreshEmitter.addListener( this.markRenderStateDirtyListener );
     }
   },
 
@@ -1458,9 +1456,7 @@ inherit( Object, Instance, {
 
       this.node.opacityProperty.unlink( this.markRenderStateDirtyListener );
       this.node.clipAreaProperty.unlink( this.markRenderStateDirtyListener );
-      this.node.hintEmitter.removeListener( this.markRenderStateDirtyListener );
-      this.node.rendererBitmaskEmitter.removeListener( this.markRenderStateDirtyListener );
-      this.node.rendererSummaryEmitter.removeListener( this.markRenderStateDirtyListener );
+      this.node.instanceRefreshEmitter.removeListener( this.markRenderStateDirtyListener );
     }
   },
 

js/nodes/Path.js

@@ -317,7 +317,7 @@ inherit( Node, Path, {
       this._boundsMethod = boundsMethod;
       this.invalidatePath();
 
-      this.selfBoundsValidEmitter.emit(); // whether our self bounds are valid may have changed
+      this.rendererSummaryRefreshEmitter.emit(); // whether our self bounds are valid may have changed
     }
     return this;
   },
@@ -431,7 +431,8 @@ inherit( Node, Path, {
    */
   invalidateStroke: function() {
     this.invalidatePath();
-    this.selfBoundsValidEmitter.emit(); // Stroke changing could have changed our self-bounds-validitity (unstroked/etc)
+
+    this.rendererSummaryRefreshEmitter.emit(); // Stroke changing could have changed our self-bounds-validitity (unstroked/etc)
   },
 
   /**

js/nodes/RichText.js

@@ -225,8 +225,6 @@ function RichText( text, options ) {
 
   Node.call( this );
 
-  Node.preventSettersOnProperty( this, 'textProperty' );
-
   // @private {Node} - Normal layout container of lines (separate, so we can clear it easily)
   this.lineContainer = new Node( {} );
   this.addChild( this.lineContainer );
@@ -720,7 +718,7 @@ inherit( Node, RichText, {
       this.textProperty.setPropertyValue( text );
       this.rebuildRichText();
 
-      this.textProperty._notifyListeners( oldText );
+      this.textProperty.notifyListeners( oldText );
     }
     return this;
   },

js/nodes/Text.js

@@ -86,8 +86,6 @@ function Text( text, options ) {
 
   Node.call( this, options );
 
-  Node.preventSettersOnProperty( this, 'textProperty' );
-
   this.invalidateSupportedRenderers(); // takes care of setting up supported renderers
 }
 
@@ -139,7 +137,7 @@ inherit( Node, Text, {
 
       this.invalidateText();
 
-      this.textProperty._notifyListeners( oldText );
+      this.textProperty.notifyListeners( oldText );
     }
     return this;
   },
@@ -215,7 +213,7 @@ inherit( Node, Text, {
 
       this.invalidateText();
 
-      this.selfBoundsValidEmitter.emit(); // whether our self bounds are valid may have changed
+      this.rendererSummaryRefreshEmitter.emit(); // whether our self bounds are valid may have changed
     }
     return this;
   },

js/util/DisplayedProperty.js

@@ -36,16 +36,14 @@ class DisplayedProperty extends BooleanProperty {
 
     // @private {function}
     this.updateListener = this.updateValue.bind( this );
-    this.addedInstancelistener = this.addedInstance.bind( this );
-    this.removedInstancelistener = this.removedInstance.bind( this );
+    this.changedInstanceListener = this.changedInstance.bind( this );
 
-    node.addedInstanceEmitter.addListener( this.addedInstancelistener );
-    node.removedInstanceEmitter.addListener( this.removedInstancelistener );
+    node.changedInstanceEmitter.addListener( this.changedInstanceListener );
 
     // Add any instances the node may already have/
     const instances = node.instances;
     for ( let i = 0; i < instances.length; i++ ) {
-      this.addedInstance( instances[ i ] );
+      this.changedInstance( instances[ i ], true );
     }
   }
 
@@ -58,24 +56,20 @@ class DisplayedProperty extends BooleanProperty {
   }
 
   /**
-   * Adds a listener to one of the node's instances.
+   * Called when an instance is changed or added (based on the boolean flag).
    * @private
    *
    * @param {Instance} instance
+   * @param {boolean} added
    */
-  addedInstance( instance ) {
-    instance.visibleEmitter.addListener( this.updateListener );
-    this.updateValue();
-  }
+  changedInstance( instance, added ) {
+    if ( added ) {
+      instance.visibleEmitter.addListener( this.updateListener );
+    }
+    else {
+      instance.visibleEmitter.removeListener( this.updateListener );
+    }
 
-  /**
-   * Removes a listener from one of the node's instances.
-   * @private
-   *
-   * @param {Instance} instance
-   */
-  removedInstance( instance ) {
-    instance.visibleEmitter.removeListener( this.updateListener );
     this.updateValue();
   }
 
@@ -88,11 +82,10 @@ class DisplayedProperty extends BooleanProperty {
     // Remove any instances the node may still have
     const instances = this.node.instances;
     for ( let i = 0; i < instances.length; i++ ) {
-      this.removedInstance( instances[ i ] );
+      this.changedInstance( instances[ i ], false );
     }
 
-    this.node.addedInstanceEmitter.removeListener( this.addedInstancelistener );
-    this.node.removedInstanceEmitter.removeListener( this.removedInstancelistener );
+    this.node.changedInstanceEmitter.removeListener( this.changedInstanceListener );
 
     super.dispose();
   }

js/util/RendererSummary.js

@@ -77,10 +77,7 @@ function RendererSummary( node ) {
   const listener = this.selfChange.bind( this );
   this.node.opacityProperty.lazyLink( listener );
   this.node.clipAreaProperty.lazyLink( listener );
-  this.node.hintEmitter.addListener( listener ); // should fire on things like node.renderer being changed
-  this.node.selfBoundsValidEmitter.addListener( listener ); // e.g. Text, may change based on boundsMethod
-  this.node.accessibleContentEmitter.addListener( listener );
-  this.node.accessibleOrderEmitter.addListener( listener );
+  this.node.rendererSummaryRefreshEmitter.addListener( listener );
 }
 
 scenery.register( 'RendererSummary', RendererSummary );
@@ -143,7 +140,7 @@ inherit( Object, RendererSummary, {
         }
       }
 
-      this.node.rendererSummaryEmitter.emit();
+      this.node.instanceRefreshEmitter.emit();
       this.node.onSummaryChange( oldSubtreeBitmask, this.bitmask );
 
       const len = this.node._parents.length;