mixin => mixInto() and trait (with added assertions). See phetsims/sc…

…enery#700
phetsims · Oct 26, 2017 · e228eb2 · e228eb2
1 parent 327b185
commit e228eb2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/js/Bounds2.js b/js/Bounds2.js
@@ -1346,7 +1346,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Bounds2, {
+  Poolable.mixInto( Bounds2, {
     defaultFactory: function() { return Bounds2.NOTHING.copy(); },
     constructorDuplicateFactory: function( pool ) {
       return function( minX, minY, maxX, maxY ) {

diff --git a/js/Bounds3.js b/js/Bounds3.js
@@ -1400,7 +1400,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Bounds3, {
+  Poolable.mixInto( Bounds3, {
     defaultFactory: function() { return Bounds3.NOTHING.copy(); },
     constructorDuplicateFactory: function( pool ) {
       return function( minX, minY, minZ, maxX, maxY, maxZ ) {

diff --git a/js/Matrix3.js b/js/Matrix3.js
@@ -974,7 +974,7 @@ define( function( require ) {
     }
   };
 
-  Poolable.mixin( Matrix3, {
+  Poolable.mixInto( Matrix3, {
 
     //The default factory creates an identity matrix
     defaultFactory: function() { return new Matrix3(); },

diff --git a/js/Quaternion.js b/js/Quaternion.js
@@ -370,7 +370,7 @@ define( function( require ) {
     );
   };
 
-  Poolable.mixin( Quaternion, {
+  Poolable.mixInto( Quaternion, {
     defaultFactory: function() { return new Quaternion(); },
     constructorDuplicateFactory: function( pool ) {
       return function( x, y, z, w ) {

diff --git a/js/Vector2.js b/js/Vector2.js
@@ -925,7 +925,7 @@ define( function( require ) {
   } );
 
   // Sets up pooling on Vector2
-  Poolable.mixin( Vector2, {
+  Poolable.mixInto( Vector2, {
     defaultFactory: function() { return new Vector2(); },
     constructorDuplicateFactory: function( pool ) {
       return function( x, y ) {

diff --git a/js/Vector3.js b/js/Vector3.js
@@ -798,7 +798,7 @@ define( function( require ) {
   } );
 
   // Sets up pooling on Vector3
-  Poolable.mixin( Vector3, {
+  Poolable.mixInto( Vector3, {
     defaultFactory: function() { return new Vector3(); },
     constructorDuplicateFactory: function( pool ) {
       return function( x, y, z ) {

diff --git a/js/Vector4.js b/js/Vector4.js
@@ -779,7 +779,7 @@ define( function( require ) {
   } );
 
   // Sets up pooling on Vector4
-  Poolable.mixin( Vector4, {
+  Poolable.mixInto( Vector4, {
     defaultFactory: function() { return new Vector4(); },
     constructorDuplicateFactory: function( pool ) {
       return function( x, y, z, w ) {