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

…enery#700
phetsims · Oct 26, 2017 · e58198c · e58198c
1 parent 2c921cb
commit e58198c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/js/ops/Boundary.js b/js/ops/Boundary.js
@@ -229,7 +229,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Boundary, {
+  Poolable.mixInto( Boundary, {
     constructorDuplicateFactory: function( pool ) {
       return function( halfEdges ) {
         if ( pool.length ) {

diff --git a/js/ops/BoundsIntersection.js b/js/ops/BoundsIntersection.js
@@ -318,7 +318,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( BoundsIntersection, {
+  Poolable.mixInto( BoundsIntersection, {
     constructorDuplicateFactory: function( pool ) {
       return function( a, b, atMin, atMax, btMin, btMax, aMin, aMax, bMin, bMax ) {
         if ( pool.length ) {

diff --git a/js/ops/Edge.js b/js/ops/Edge.js
@@ -119,7 +119,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Edge, {
+  Poolable.mixInto( Edge, {
     constructorDuplicateFactory: function( pool ) {
       return function( segment, startVertex, endVertex ) {
         if ( pool.length ) {

diff --git a/js/ops/Face.js b/js/ops/Face.js
@@ -119,7 +119,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Face, {
+  Poolable.mixInto( Face, {
     constructorDuplicateFactory: function( pool ) {
       return function( boundary ) {
         if ( pool.length ) {

diff --git a/js/ops/HalfEdge.js b/js/ops/HalfEdge.js
@@ -174,7 +174,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( HalfEdge, {
+  Poolable.mixInto( HalfEdge, {
     constructorDuplicateFactory: function( pool ) {
       return function( edge, isReversed ) {
         if ( pool.length ) {

diff --git a/js/ops/Loop.js b/js/ops/Loop.js
@@ -75,7 +75,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Loop, {
+  Poolable.mixInto( Loop, {
     constructorDuplicateFactory: function( pool ) {
       return function( shapeId ) {
         if ( pool.length ) {

diff --git a/js/ops/Vertex.js b/js/ops/Vertex.js
@@ -145,7 +145,7 @@ define( function( require ) {
     }
   } );
 
-  Poolable.mixin( Vertex, {
+  Poolable.mixInto( Vertex, {
     constructorDuplicateFactory: function( pool ) {
       return function( point ) {
         if ( pool.length ) {