Fixed ColorMatrix.concat()

Signed-off-by: Grant Skinner <info@gskinner.com>

VERSIONS.txt

@@ -6,8 +6,9 @@ Version NEXT [NOT RELEASED]
 - fixed an issue related to modal dialogs and pointer position for mouse down
 - fixed an issue when calling gotoAndStop(animation) in the animationend event stack for the same animation
 - ColorMatrix no longer extends Array
-- fixed ColorMatrix.toArray() and .clone()
+- fixed ColorMatrix.toArray(), .concat(), and .clone()
 - fixed touch/multitouch in IE11
+- changed dblclick to use a canvas listener instead of global listener
 
 
 Version 0.7.0 [September 25, 2013]

src/easeljs/filters/ColorMatrix.js

@@ -295,6 +295,15 @@ this.createjs = this.createjs||{};
 		}
 		return this;
 	};
+
+	/**
+	 * Returns a string representation of this object.
+	 * @method toString
+	 * @return {String} a string representation of the instance.
+	 **/
+	p.toString = function() {
+		return "[ColorMatrix]";
+	};
 
 // private methods:
 
@@ -339,7 +348,7 @@ this.createjs = this.createjs||{};
 	 * @protected
 	 **/
 	p._fixMatrix = function(matrix) {
-		if (matrix instanceof ColorMatrix) { matrix = matrix.slice(0); }
+		if (matrix instanceof ColorMatrix) { matrix = matrix.toArray(); }
 		if (matrix.length < ColorMatrix.LENGTH) {
 			matrix = matrix.slice(0,matrix.length).concat(ColorMatrix.IDENTITY_MATRIX.slice(matrix.length,ColorMatrix.LENGTH));
 		} else if (matrix.length > ColorMatrix.LENGTH) {
@@ -348,15 +357,6 @@ this.createjs = this.createjs||{};
 		return matrix;
 	};
 
-	/**
-	 * Returns a string representation of this object.
-	 * @method toString
-	 * @return {String} a string representation of the instance.
-	 **/
-	p.toString = function () {
-		return "[ColorMatrix]";
-	};
-
 	createjs.ColorMatrix = ColorMatrix;
 
 }());