do Array check before typeof, #212

phetsims · Feb 23, 2019 · 89500ae · 89500ae
1 parent ddd8a58
commit 89500ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/js/validate.js b/js/validate.js
@@ -32,12 +32,12 @@ define( require => {
         if ( typeof valueType === 'string' ) { // primitive type
           assert( typeof value === valueType, `value should have typeof ${valueType}, value=${value}` );
         }
-        else if ( typeof valueType === 'function' ) { // constructor
-          assert( value instanceof valueType, `value should be instanceof ${valueType.name}, value=${value}` );
-        }
         else if ( valueType === Array ) {
           assert( Array.isArray( value ), `value should have been an array, value=${value}` );
         }
+        else if ( typeof valueType === 'function' ) { // constructor
+          assert( value instanceof valueType, `value should be instanceof ${valueType.name}, value=${value}` );
+        }
       }
       validator.validValues && assert( validator.validValues.indexOf( value ) >= 0, `value not in validValues: ${value}` );
       validator.isValidValue && assert( validator.isValidValue( value ), `value failed isValidValue: ${value}` );