convert Voicing to typescript and the new mixin pattern, phetsims/sce…

…nery#1340
phetsims · Jan 26, 2022 · 409096b · 409096b
1 parent 801ab4c
commit 409096b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/js/view/DistanceArrowNode.js b/js/view/DistanceArrowNode.js
@@ -25,7 +25,7 @@ const distanceArrowReadingBlockContentString = gravityForceLabBasicsStrings.a11y
 const HEAD_WIDTH = 8;
 const HEAD_HEIGHT = 8;
 
-class DistanceArrowNode extends Node {
+class DistanceArrowNode extends ReadingBlock( Node ) {
 
   /**
    * @mixes {ReadingBlock}
@@ -46,9 +46,6 @@ class DistanceArrowNode extends Node {
 
     super();
 
-    // voicing - initialize the trait
-    this.initializeReadingBlock();
-
     const arrowNode = new ArrowNode( model.object1.positionProperty.get(), 0,
       model.object2.positionProperty.get(), 0, {
         doubleHead: true,
@@ -98,7 +95,5 @@ class DistanceArrowNode extends Node {
   }
 }
 
-ReadingBlock.compose( DistanceArrowNode );
-
 gravityForceLabBasics.register( 'DistanceArrowNode', DistanceArrowNode );
 export default DistanceArrowNode;
diff --git a/js/view/GFLBMassControl.js b/js/view/GFLBMassControl.js
@@ -150,7 +150,7 @@ gravityForceLabBasics.register( 'GFLBMassControl', GFLBMassControl );
  * An inner class for the mass contents surrounding the NumberPicker (title, readout) that can be activated
  * to get the current value and any other help content provided by Voicing.
  */
-class MassControlReadingBlock extends VBox {
+class MassControlReadingBlock extends ReadingBlock( VBox ) {
 
   /**
    * @mixes {ReadingBlock}
@@ -165,14 +165,10 @@ class MassControlReadingBlock extends VBox {
     }, options );
 
     super();
-    this.initializeReadingBlock();
-
     this.mutate( options );
   }
 }
 
-ReadingBlock.compose( MassControlReadingBlock );
-
 
 /**
  * An inner class that implements the Voicing for the NumberPicker. Eventually this could be moved to NumberPicker,