Merge branch 'master' into a11ystring-plugin

phetsims · Sep 27, 2019 · 187ba4b · 187ba4b
2 parents ffcc1d8 + 64fda46
commit 187ba4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 56 deletions.
diff --git a/friction_en.html b/friction_en.html
@@ -49,7 +49,8 @@
     '../sherpa/lib/game-up-camera-1.0.0.js',
     '../sherpa/lib/base64-js-1.2.0.js',
     '../sherpa/lib/TextEncoderLite-3c9f6f0.js',
-    '../tandem/js/PhetioIDUtils.js'
+    '../tandem/js/PhetioIDUtils.js',
+    '../chipper/js/SimVersion.js'
   ];
 
   if ( brand === 'phet-io' ) {

diff --git a/js/phet-io/friction-phet-io-elements-baseline.js b/js/phet-io/friction-phet-io-elements-baseline.js
@@ -493,18 +493,6 @@ window.phet.phetio.phetioElementsBaseline = assert &&
       "phetioStudioControl": true,
       "phetioTypeName": "PropertyIO<BooleanIO>"
     },
-    "friction.frictionScreen.view.topBookNode": {
-      "phetioDocumentation": "",
-      "phetioDynamicElement": false,
-      "phetioEventType": "MODEL",
-      "phetioFeatured": false,
-      "phetioHighFrequency": false,
-      "phetioPlayback": false,
-      "phetioReadOnly": false,
-      "phetioState": false,
-      "phetioStudioControl": true,
-      "phetioTypeName": "NodeIO"
-    },
     "friction.frictionScreen.view.topBookNode.dragHandler": {
       "phetioDocumentation": "",
       "phetioDynamicElement": false,
@@ -565,30 +553,6 @@ window.phet.phetio.phetioElementsBaseline = assert &&
       "phetioStudioControl": true,
       "phetioTypeName": "PropertyIO<BooleanIO>"
     },
-    "friction.frictionScreen.view.topBookNode.opacityProperty": {
-      "phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
-      "phetioDynamicElement": false,
-      "phetioEventType": "MODEL",
-      "phetioFeatured": false,
-      "phetioHighFrequency": false,
-      "phetioPlayback": false,
-      "phetioReadOnly": false,
-      "phetioState": true,
-      "phetioStudioControl": true,
-      "phetioTypeName": "NumberPropertyIO"
-    },
-    "friction.frictionScreen.view.topBookNode.pickableProperty": {
-      "phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
-      "phetioDynamicElement": false,
-      "phetioEventType": "MODEL",
-      "phetioFeatured": false,
-      "phetioHighFrequency": false,
-      "phetioPlayback": false,
-      "phetioReadOnly": false,
-      "phetioState": true,
-      "phetioStudioControl": true,
-      "phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
-    },
     "friction.frictionScreen.view.topBookNode.titleText": {
       "phetioDocumentation": "",
       "phetioDynamicElement": false,
@@ -649,18 +613,6 @@ window.phet.phetio.phetioElementsBaseline = assert &&
       "phetioStudioControl": true,
       "phetioTypeName": "PropertyIO<BooleanIO>"
     },
-    "friction.frictionScreen.view.topBookNode.visibleProperty": {
-      "phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
-      "phetioDynamicElement": false,
-      "phetioEventType": "MODEL",
-      "phetioFeatured": false,
-      "phetioHighFrequency": false,
-      "phetioPlayback": false,
-      "phetioReadOnly": false,
-      "phetioState": true,
-      "phetioStudioControl": true,
-      "phetioTypeName": "PropertyIO<BooleanIO>"
-    },
     "friction.general.activeProperty": {
       "phetioDocumentation": "Determines whether the entire simulation is running and processing user input. Setting this property to false pauses the simulation, and prevents user interaction.",
       "phetioDynamicElement": false,

diff --git a/js/phet-io/friction-phet-io-types.js b/js/phet-io/friction-phet-io-types.js
@@ -557,7 +557,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "NumberIO"
@@ -848,7 +848,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "BooleanIO"
@@ -892,7 +892,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "NullableIO<BooleanIO>"
@@ -936,7 +936,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "NullableIO<FocusIO>"
@@ -980,7 +980,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "NumberIO"
@@ -1024,7 +1024,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "StringIO"
@@ -1068,7 +1068,7 @@ window.phet.phetio.phetioTypes = assert &&
           "returnType": "VoidIO"
         },
         "setValue": {
-          "documentation": "Sets the value of the property. If the value differs from the previous value, listeners are notified with the new value.",
+          "documentation": "Sets the value of the Property. If the value differs from the previous value, listeners are notified with the new value.",
           "invocableForReadOnlyElements": false,
           "parameterTypes": [
             "Vector2IO"