X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Feffects.js;h=73d94ef3489b6f435a5d3c03e907977c4b73e920;hb=fc5b69fc706a6025e5084d4b86adb3b97840c84f;hp=97456ccc4b4cab163ac00faecef36b43df9f5f85;hpb=dcf0fa5048ef2379d551f29ffa29b14ec5ee09d5;p=jquery.git

diff --git a/src/effects.js b/src/effects.js
index 97456cc..73d94ef 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -1,6 +1,9 @@
+(function( jQuery ) {
+
 var elemdisplay = {},
 	rfxtypes = /toggle|show|hide/,
 	rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+	rdashAlpha = /-([a-z])/ig,
 	timerId,
 	fxAttrs = [
 		// height animations
@@ -9,7 +12,11 @@ var elemdisplay = {},
 		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
 		// opacity animations
 		[ "opacity" ]
-	];
+	],
+
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
 
 jQuery.fn.extend({
 	show: function( speed, callback ) {
@@ -320,7 +327,7 @@ jQuery.fx.prototype = {
 
 	// Start an animation from one number to another
 	custom: function( from, to, unit ) {
-		this.startTime = now();
+		this.startTime = jQuery.now();
 		this.start = from;
 		this.end = to;
 		this.unit = unit || this.unit || "px";
@@ -366,7 +373,7 @@ jQuery.fx.prototype = {
 
 	// Each step of an animation
 	step: function( gotoEnd ) {
-		var t = now(), done = true;
+		var t = jQuery.now(), done = true;
 
 		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
 			this.now = this.end;
@@ -480,3 +487,5 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 		}).length;
 	};
 }
+
+})( jQuery );