Merge remote-tracking branch 'origin/master'

phetsims · Dec 11, 2021 · cff9039 · cff9039
2 parents 69293dc + 6de5c92
commit cff9039
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/js/game/model/CountingGameLevel.ts b/js/game/model/CountingGameLevel.ts
@@ -24,7 +24,7 @@ const LEVEL_INPUT_RANGE = 10;
 class CountingGameLevel extends NumberPlayGameLevel {
 
   public readonly objectsPlayArea: OnesPlayArea;
-  public readonly playObjectTypeProperty: EnumerationProperty<any>;
+  public readonly playObjectTypeProperty: EnumerationProperty;
   public readonly isObjectsRepresentationProperty: BooleanProperty;
   public readonly groupObjects: boolean;
 

diff --git a/js/game/model/Subitizer.ts b/js/game/model/Subitizer.ts
@@ -15,6 +15,7 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import StringEnumerationProperty from '../../../../axon/js/StringEnumerationProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import IReadOnlyProperty from '../../../../axon/js/IReadOnlyProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
@@ -181,7 +182,7 @@ class Subitizer {
     this.isInputEnabledProperty = new BooleanProperty( false );
 
     // the object type of the current shape
-    this.objectTypeProperty = new Property<SubitizeObjectTypeEnum>( 'dog' );
+    this.objectTypeProperty = new StringEnumerationProperty( SubitizeObjectTypeValues, 'dog' );
 
     // how long the shape is visible when shown, in seconds. This is a derived Property instead of a constant because
     // the time that the shape is shown is increased if the user gets the answer wrong multiple times.