Bringing the effects module closer to being inline with the style guideline.

src/effects.js

@@ -1,4 +1,6 @@
 var elemdisplay = {},
+	rfxtypes = /toggle|show|hide/,
+	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
 	timerId,
 	fxAttrs = [
 		// height animations
@@ -9,18 +11,11 @@ var elemdisplay = {},
 		[ "opacity" ]
 	];
 
-function genFx( type, num ){
-	var obj = {};
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
-		obj[ this ] = type;
-	});
-	return obj;
-}
-
 jQuery.fn.extend({
 	show: function( speed, callback ) {
 		if ( speed != null ) {
 			return this.animate( genFx("show", 3), speed, callback);
+
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
 				var old = jQuery.data(this[i], "olddisplay");
@@ -32,13 +27,16 @@ jQuery.fn.extend({
 
 					if ( elemdisplay[ nodeName ] ) {
 						display = elemdisplay[ nodeName ];
+
 					} else {
 						var elem = jQuery("<" + nodeName + " />").appendTo("body");
 
 						display = elem.css("display");
+
 						if ( display === "none" ) {
 							display = "block";
 						}
+
 						elem.remove();
 
 						elemdisplay[ nodeName ] = display;
@@ -50,8 +48,8 @@ jQuery.fn.extend({
 
 			// Set the display of the elements in a second loop
 			// to avoid the constant reflow
-			for ( var i = 0, l = this.length; i < l; i++ ){
+			for ( var j = 0, k = this.length; j < k; j++ ){
-				this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
 			}
 
 			return this;
@@ -61,6 +59,7 @@ jQuery.fn.extend({
 	hide: function( speed, callback ) {
 		if ( speed != null ) {
 			return this.animate( genFx("hide", 3), speed, callback);
+
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
 				var old = jQuery.data(this[i], "olddisplay");
@@ -71,8 +70,8 @@ jQuery.fn.extend({
 
 			// Set the display of the elements in a second loop
 			// to avoid the constant reflow
-			for ( var i = 0, l = this.length; i < l; i++ ){
+			for ( var j = 0, k = this.length; j < k; j++ ){
-				this[i].style.display = "none";
+				this[j].style.display = "none";
 			}
 
 			return this;
@@ -85,18 +84,24 @@ jQuery.fn.extend({
 	toggle: function( fn, fn2 ) {
 		var bool = typeof fn === "boolean";
 
-		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments ) :
+			this._toggle.apply( this, arguments );
-			fn == null || bool ?
+
+		} else if ( fn == null || bool ) {
 			this.each(function(){
 				var state = bool ? fn : jQuery(this).is(":hidden");
 				jQuery(this)[ state ? "show" : "hide" ]();
-				}) :
+			});
+
+		} else {
 			this.animate(genFx("toggle", 3), fn, fn2);
+		}
+
+		return this;
 	},
 
 	fadeTo: function( speed, to, callback ) {
-		return this.filter(":hidden").css('opacity', 0).show().end()
+		return this.filter(":hidden").css("opacity", 0).show().end()
 					.animate({opacity: to}, speed, callback);
 	},
 
@@ -104,9 +109,8 @@ jQuery.fn.extend({
 		var optall = jQuery.speed(speed, easing, callback);
 
 		return this[ optall.queue === false ? "each" : "queue" ](function() {
-
 			var opt = jQuery.extend({}, optall), p,
-				hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
+				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
 				self = this;
 
 			for ( p in prop ) {
@@ -118,16 +122,18 @@ jQuery.fn.extend({
 					p = name;
 				}
 
-				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) {
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
 					return opt.complete.call(this);
 				}
-				if ( ( p == "height" || p == "width" ) && this.style ) {
+
+				if ( ( p === "height" || p === "width" ) && this.style ) {
 					// Store display property
 					opt.display = jQuery.css(this, "display");
 
 					// Make sure that nothing sneaks out
 					opt.overflow = this.style.overflow;
 				}
+
 				if ( jQuery.isArray( prop[p] ) ) {
 					// Create (if needed) and add to specialEasing
 					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
@@ -138,15 +144,17 @@ jQuery.fn.extend({
 			if ( opt.overflow != null ) {
 				this.style.overflow = "hidden";
 			}
+
 			opt.curAnim = jQuery.extend({}, prop);
 
 			jQuery.each( prop, function( name, val ) {
 				var e = new jQuery.fx( self, opt, name );
 
-				if ( /toggle|show|hide/.test(val) ) {
+				if ( rfxtypes.test(val) ) {
-					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
 				} else {
-					var parts = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val),
+					var parts = rfxnum.exec(val),
 						start = e.cur(true) || 0;
 
 					if ( parts ) {
@@ -154,7 +162,7 @@ jQuery.fn.extend({
 							unit = parts[3] || "px";
 
 						// We need to compute starting value
-						if ( unit != "px" ) {
+						if ( unit !== "px" ) {
 							self.style[ name ] = (end || 1) + unit;
 							start = ((end || 1) / e.cur(true)) * start;
 							self.style[ name ] = start + unit;
@@ -162,9 +170,11 @@ jQuery.fn.extend({
 
 						// If a +=/-= token was provided, we're doing a relative animation
 						if ( parts[1] ) {
-							end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
 						}
+
 						e.custom( start, end, unit );
+
 					} else {
 						e.custom( start, val, "" );
 					}
@@ -186,14 +196,16 @@ jQuery.fn.extend({
 		if ( clearQueue ) {
 			this.queue([]);
 		}
+
 		this.each(function(){
 			// go in reverse order so anything added to the queue during the loop is ignored
 			for ( var i = timers.length - 1; i >= 0; i-- ) {
-				if ( timers[i].elem == this ) {
+				if ( timers[i].elem === this ) {
 					if (gotoEnd) {
 						// force the next step to be the last
 						timers[i](true);
 					}
+
 					timers.splice(i, 1);
 				}
 			}
@@ -203,6 +215,7 @@ jQuery.fn.extend({
 		if ( !gotoEnd ) {
 			this.dequeue();
 		}
+
 		return this;
 	}
 
@@ -222,7 +235,6 @@ jQuery.each({
 });
 
 jQuery.extend({
-
 	speed: function( speed, easing, fn ) {
 		var opt = speed && typeof speed === "object" ? speed : {
 			complete: fn || !fn && easing ||
@@ -272,16 +284,16 @@ jQuery.extend({
 });
 
 jQuery.fx.prototype = {
-
 	// Simple function for setting a style value
 	update: function() {
 		if ( this.options.step ) {
 			this.options.step.call( this.elem, this.now, this );
 		}
+
 		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
 
 		// Set display property to block for height/width animations
-		if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style ) {
+		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
 			this.elem.style.display = "block";
 		}
 	},
@@ -291,6 +303,7 @@ jQuery.fx.prototype = {
 		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
 			return this.elem[ this.prop ];
 		}
+
 		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
 		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
 	},
@@ -325,7 +338,7 @@ jQuery.fx.prototype = {
 		// Begin the animation
 		// Make sure that we start at a small width/height to avoid any
 		// flash of content
-		this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur());
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
 
 		// Start by showing the element
 		jQuery( this.elem ).show();
@@ -343,7 +356,7 @@ jQuery.fx.prototype = {
 
 	// Each step of an animation
 	step: function( gotoEnd ) {
-		var t = now();
+		var t = now(), done = true;
 
 		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
 			this.now = this.end;
@@ -352,12 +365,12 @@ jQuery.fx.prototype = {
 
 			this.options.curAnim[ this.prop ] = true;
 
-			var done = true;
 			for ( var i in this.options.curAnim ) {
 				if ( this.options.curAnim[i] !== true ) {
 					done = false;
 				}
 			}
+
 			if ( done ) {
 				if ( this.options.display != null ) {
 					// Reset the overflow
@@ -367,7 +380,7 @@ jQuery.fx.prototype = {
 					var old = jQuery.data(this.elem, "olddisplay");
 					this.elem.style.display = old ? old : this.options.display;
 
-					if ( jQuery.css(this.elem, "display") == "none" ) {
+					if ( jQuery.css(this.elem, "display") === "none" ) {
 						this.elem.style.display = "block";
 					}
 				}
@@ -376,17 +389,20 @@ jQuery.fx.prototype = {
 				if ( this.options.hide ) {
 					jQuery(this.elem).hide();
 				}
+
 				// Reset the properties, if the item has been hidden or shown
 				if ( this.options.hide || this.options.show ) {
 					for ( var p in this.options.curAnim ) {
 						jQuery.style(this.elem, p, this.options.orig[p]);
 					}
 				}
+
 				// Execute the complete function
 				this.options.complete.call( this.elem );
 			}
 
 			return false;
+
 		} else {
 			var n = t - this.startTime;
 			this.state = n / this.options.duration;
@@ -403,11 +419,9 @@ jQuery.fx.prototype = {
 
 		return true;
 	}
-
 };
 
 jQuery.extend( jQuery.fx, {
-
 	tick: function() {
 		var timers = jQuery.timers;
 
@@ -416,6 +430,7 @@ jQuery.extend( jQuery.fx, {
 				timers.splice(i--, 1);
 			}
 		}
+
 		if ( !timers.length ) {
 			jQuery.fx.stop();
 		}
@@ -434,7 +449,6 @@ jQuery.extend( jQuery.fx, {
 	},
 
 	step: {
-
 		opacity: function( fx ) {
 			jQuery.style(fx.elem, "opacity", fx.now);
 		},
@@ -456,3 +470,13 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 		}).length;
 	};
 }
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
+		obj[ this ] = type;
+	});
+
+	return obj;
+}