Merge pull request #1888 from cb1kenobi/timob-8434

[TIMOB-8434] Fixed y scaling factor to use x's factor when y is not passed in
tidev · Apr 2, 2012 · fcd1960 · fcd1960
2 parents 5efc8e1 + f627231
commit fcd1960
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mobileweb/titanium/Ti/UI/2DMatrix.js b/mobileweb/titanium/Ti/UI/2DMatrix.js
@@ -1,4 +1,5 @@
-define(["Ti/_/declare", "Ti/_/Evented", "Ti/Platform"], function(declare, Evented, Platform) {
+define(["Ti/_/declare", "Ti/_/Evented", "Ti/_/lang", "Ti/Platform"],
+	function(declare, Evented, lang, Platform) {
 
 	var isFF = Platform.runtime === "gecko",
 		api,
@@ -71,7 +72,7 @@ define(["Ti/_/declare", "Ti/_/Evented", "Ti/Platform"], function(declare, Evente
 		},
 
 		scale: function(x, y) {
-			return new api(mult(this, x, 0, 0, y, 0, 0));
+			return new api(mult(this, x, 0, 0, lang.val(y, x), 0, 0));
 		},
 
 		translate: function(x, y) {