Merge remote-tracking branch 'origin/master'

phetsims · Sep 28, 2018 · 62b64e7 · 62b64e7
2 parents 28483cd + fa137c9
commit 62b64e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/js/nodes/ImageIO.js b/js/nodes/ImageIO.js
@@ -39,7 +39,7 @@ define( function( require ) {
         this.instance.image = im;
       },
       documentation: 'Set the image from a base64 string',
-      canBeInvokedForReadOnlyInstances: false
+      invocableForReadOnlyInstances: false
     }
   }, {
     documentation: 'The tandem IO type for the scenery Text node',

diff --git a/js/nodes/Node.js b/js/nodes/Node.js
@@ -4958,8 +4958,6 @@ define( function( require ) {
         return this;
       }
 
-      this.initializePhetioObject( { phetioType: NodeIO }, options );
-
       assert && assert( Object.getPrototypeOf( options ) === Object.prototype,
         'Extra prototype on Node options object is a code smell' );
 
@@ -4989,6 +4987,8 @@ define( function( require ) {
         }
       } );
 
+      this.initializePhetioObject( { phetioType: NodeIO }, options );
+
       return this; // allow chaining
     },
 

diff --git a/js/nodes/TextIO.js b/js/nodes/TextIO.js
@@ -68,7 +68,7 @@ define( function( require ) {
       },
       documentation: 'Sets font options for this TextIO instance, e.g. {size: 16, weight: bold}. If increasing the font ' +
                      'size does not make the text size larger, you may need to increase the maxWidth of the TextIO also.',
-      canBeInvokedForReadOnlyInstances: false
+      invocableForReadOnlyInstances: false
     },
 
     getFontOptions: {
@@ -88,7 +88,7 @@ define( function( require ) {
       },
       documentation: 'Sets the maximum width of text box. ' +
                      'If the text width exceeds maxWidth, it is scaled down to fit.',
-      canBeInvokedForReadOnlyInstances: false
+      invocableForReadOnlyInstances: false
     },
 
     getMaxWidth: {