animate uses jQuery.speed to get options. Should fix #22

daffl · daffl · commit 1c69608af06c · 2012-06-13T10:20:30.000-06:00
diff --git a/dom/animate/animate.js b/dom/animate/animate.js
@@ -50,22 +50,26 @@ steal('jquery', 'jquery/dom/styles').then(function ($) {
 				isInline = !nonElement && $(this).css("display") === "inline" && $(this).css("float") === "none";
 
 			for (var name in props) {
-				if (props[name] == 'show' || props[name] == 'hide' // jQuery does something with these two values
-					|| $.isArray(props[name]) // Arrays for individual easing
-					|| props[name] < 0 // Negative values not handled the same
+				// jQuery does something with these values
+				if (props[name] == 'show' || props[name] == 'hide' || props[name] == 'toggle'
+					// Arrays for individual easing
+					|| $.isArray(props[name])
+					// Negative values not handled the same
+					|| props[name] < 0
+					// unit-less value
 					|| name == 'zIndex' || name == 'z-index'
-					) {  // unit-less value
+					) {
 					return true;
 				}
 			}
 
 			return props.jquery === true || getBrowser() === null ||
 				// Animating empty properties
 				$.isEmptyObject(props) ||
+				// We can't do custom easing
+				ops.length == 4 || typeof ops[2] == 'string' ||
 				// Second parameter is an object - we can only handle primitives
 				$.isPlainObject(ops) ||
-				// Second parameter is a string like 'slow' TODO: remove
-				typeof ops == 'string' ||
 				// Inline and non elements
 				isInline || nonElement;
 		},
@@ -202,17 +206,16 @@ steal('jquery', 'jquery/dom/styles').then(function ($) {
 	 * @param {Function} [callback] A callback to execute once the animation is complete
 	 * @return {jQuery} The jQuery element
 	 */
-	$.fn.animate = function (props, speed, callback) {
+	$.fn.animate = function (props, speed, easing, callback) {
 		//default to normal animations if browser doesn't support them
 		if (passThrough.apply(this, arguments)) {
 			return oldanimate.apply(this, arguments);
 		}
-		if ($.isFunction(speed)) {
-			callback = speed;
-		}
+
+		var optall = jQuery.speed(speed, easing, callback);
 
 		// Add everything to the animation queue
-		this.queue('fx', function(done) {
+		this.queue(optall.queue, function(done) {
 			var
 				//current CSS values
 				current,
@@ -221,7 +224,7 @@ steal('jquery', 'jquery/dom/styles').then(function ($) {
 				to = "",
 				prop,
 				self = $(this),
-				duration = $.fx.speeds[speed] || speed || $.fx.speeds._default,
+				duration = optall.duration,
 				//the animation keyframe name
 				animationName,
 				// The key used to store the animation hook
@@ -240,9 +243,10 @@ steal('jquery', 'jquery/dom/styles').then(function ($) {
 						"animation-play-state" : ""
 					}));
 
-					if (callback && exec) {
+					// Call the original callback
+					if (optall.old && exec) {
 						// Call success, pass the DOM element as the this reference
-						callback.call(self[0], true)
+						optall.old.call(self[0], true)
 					}
 
 					$.removeData(self, dataKey, true);
