X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e58f895df21d94f54b2dc5cbfe92120c5f5dfde4;hb=495ecb70b2b097e7d4a1ffe46d44562210cdc051;hp=893a397d7971cb800d5a91c9990053121788fc02;hpb=e473f3a9118e4eae8d1aa2c3ab3527944db2e83b;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 893a397..e58f895 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,7 +1,7 @@
 /*
  * jQuery @VERSION - New Wave Javascript
  *
- * Copyright (c) 2006 John Resig (jquery.com)
+ * Copyright (c) 2007 John Resig (jquery.com)
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
@@ -23,39 +23,40 @@ window.undefined = window.undefined;
  * @cat Core
  */
 var jQuery = function(a,c) {
-	// Make sure that a selection was provided
-	a = a || document;
-	
-	// Shortcut for document ready
-	// Safari reports typeof on DOM NodeLists as a function
-	if ( typeof a == "function" && !a.nodeType && a[0] == undefined )
-		return jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
-
-	// Watch for when a jQuery object is passed as the selector
-	if ( a.jquery )
-		return jQuery( jQuery.makeArray( a ) );
-
-	// Watch for when a jQuery object is passed at the context
-	if ( c && c.jquery )
-		return jQuery( c ).find(a);
-
 	// If the context is global, return a new object
 	if ( window == this )
 		return new jQuery(a,c);
 
+	// Make sure that a selection was provided
+	a = a || document;
+	
+	// HANDLE: $(function)
+	// Shortcut for document ready
+	if ( jQuery.isFunction(a) )
+		return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+	
 	// Handle HTML strings
 	if ( typeof a  == "string" ) {
-		var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
-		if ( m ) a = jQuery.clean( [ m[1] ] );
+		// HANDLE: $(html) -> $(array)
+		var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
+		if ( m )
+			a = jQuery.clean( [ m[1] ] );
+		
+		// HANDLE: $(expr)
+		else
+			return new jQuery( c ).find( a );
 	}
+	
+	return this.setArray(
+		// HANDLE: $(array)
+		a.constructor == Array && a ||
 
-	// Watch for when an array is passed in
-	return this.setArray( a.constructor == Array || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType ?
-		// Assume that it is an array of DOM Elements
-		jQuery.makeArray( a ) :
+		// HANDLE: $(arraylike)
+		// Watch for when an array-like object is passed as the selector
+		(a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
 
-		// Find the matching elements and save them for later
-		jQuery.find( a, c ) );
+		// HANDLE: $(*)
+		[ a ] );
 };
 
 // Map over the $ in case of overwrite
@@ -120,11 +121,6 @@ var $ = jQuery;
  * This function also accepts XML Documents and Window objects
  * as valid arguments (even though they are not DOM Elements).
  *
- * @example $(document).find("div > p")
- * @before <p>one</p> <div><p>two</p></div> <p>three</p>
- * @result [ <p>two</p> ]
- * @desc Same as $("div > p") because the document
- *
  * @example $(document.body).background( "black" );
  * @desc Sets the background color of the page to black.
  *
@@ -152,25 +148,18 @@ var $ = jQuery;
  * });
  * @desc Executes the function when the DOM is ready to be used.
  *
- * @name $
- * @param Function fn The function to execute when the DOM is ready.
- * @cat Core
- * @type jQuery
- */
-
-/**
- * A means of creating a cloned copy of a jQuery object. This function
- * copies the set of matched elements from one jQuery object and creates
- * another, new, jQuery object containing the same elements.
- *
- * @example var div = $("div");
- * $( div ).find("p");
- * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div' (as would normally be the case if a simple div.find("p") was done).
+ * @example jQuery(function($) {
+ *   // Your code using failsafe $ alias here...
+ * });
+ * @desc Uses both the shortcut for $(document).ready() and the argument
+ * to write failsafe jQuery code using the $ alias, without relying on the
+ * global alias.
  *
  * @name $
- * @param jQuery obj The jQuery object to be cloned.
+ * @param Function fn The function to execute when the DOM is ready.
  * @cat Core
  * @type jQuery
+ * @see ready(Function)
  */
 
 jQuery.fn = jQuery.prototype = {
@@ -258,24 +247,24 @@ jQuery.fn = jQuery.prototype = {
 	 * Set the jQuery object to an array of elements, while maintaining
 	 * the stack.
 	 *
-	 * @example $("img").set([ document.body ]);
-	 * @result $("img").set() == [ document.body ]
+	 * @example $("img").pushStack([ document.body ]);
+	 * @result $("img").pushStack() == [ document.body ]
 	 *
 	 * @private
-	 * @name set
+	 * @name pushStack
 	 * @type jQuery
 	 * @param Elements elems An array of elements
 	 * @cat Core
 	 */
-	set: function( a ) {
-		var ret = jQuery(this);
+	pushStack: function( a ) {
+		var ret = jQuery(a);
 		ret.prevObject = this;
-		return ret.setArray( a );
+		return ret;
 	},
 	
 	/**
 	 * Set the jQuery object to an array of elements. This operation is
-	 * completely destructive - be sure to use .set() if you wish to maintain
+	 * completely destructive - be sure to use .pushStack() if you wish to maintain
 	 * the jQuery stack.
 	 *
 	 * @example $("img").setArray([ document.body ]);
@@ -325,17 +314,17 @@ jQuery.fn = jQuery.prototype = {
 	 * Returns -1 if the object wasn't found.
 	 *
 	 * @example $("*").index( $('#foobar')[0] ) 
-	 * @before <div id="foobar"></div><b></b><span id="foo"></span>
+	 * @before <div id="foobar"><b></b><span id="foo"></span></div>
 	 * @result 0
 	 * @desc Returns the index for the element with ID foobar
 	 *
-	 * @example $("*").index( $('#foo')) 
-	 * @before <div id="foobar"></div><b></b><span id="foo"></span>
+	 * @example $("*").index( $('#foo')[0] ) 
+	 * @before <div id="foobar"><b></b><span id="foo"></span></div>
 	 * @result 2
-	 * @desc Returns the index for the element with ID foo
+	 * @desc Returns the index for the element with ID foo within another element
 	 *
-	 * @example $("*").index( $('#bar')) 
-	 * @before <div id="foobar"></div><b></b><span id="foo"></span>
+	 * @example $("*").index( $('#bar')[0] ) 
+	 * @before <div id="foobar"><b></b><span id="foo"></span></div>
 	 * @result -1
 	 * @desc Returns -1, as there is no element with ID bar
 	 *
@@ -365,7 +354,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @name attr
 	 * @type Object
 	 * @param String name The name of the property to access.
-	 * @cat DOM
+	 * @cat DOM/Attributes
 	 */
 
 	/**
@@ -382,12 +371,14 @@ jQuery.fn = jQuery.prototype = {
 	 * @name attr
 	 * @type jQuery
 	 * @param Map properties Key/value pairs to set as object properties.
-	 * @cat DOM
+	 * @cat DOM/Attributes
 	 */
 
 	/**
 	 * Set a single property to a value, on all matched elements.
 	 *
+	 * Can compute values provided as ${formula}, see second example.
+	 *
 	 * Note that you can't set the name property of input elements in IE.
 	 * Use $(html) or .append(html) or .html(html) to create elements
 	 * on the fly including the name property.
@@ -397,35 +388,61 @@ jQuery.fn = jQuery.prototype = {
 	 * @result <img src="test.jpg"/>
 	 * @desc Sets src attribute to all images.
 	 *
+	 * @example $("img").attr("title", "${this.src}");
+	 * @before <img src="test.jpg" />
+	 * @result <img src="test.jpg" title="test.jpg" />
+	 * @desc Sets title attribute from src attribute, a shortcut for attr(String,Function)
+	 *
 	 * @name attr
 	 * @type jQuery
 	 * @param String key The name of the property to set.
 	 * @param Object value The value to set the property to.
-	 * @cat DOM
+	 * @cat DOM/Attributes
+	 */
+	 
+	/**
+	 * Set a single property to a computed value, on all matched elements.
+	 *
+	 * Instead of a value, a function is provided, that computes the value.
+	 *
+	 * @example $("img").attr("title", function() { return this.src });
+	 * @before <img src="test.jpg" />
+	 * @result <img src="test.jpg" title="test.jpg" />
+	 * @desc Sets title attribute from src attribute.
+	 *
+	 * @example $("img").attr("title", function(index) { return this.title + (i + 1); });
+	 * @before <img title="pic" /><img title="pic" /><img title="pic" />
+	 * @result <img title="pic1" /><img title="pic2" /><img title="pic3" />
+	 * @desc Enumerate title attribute.
+	 *
+	 * @name attr
+	 * @type jQuery
+	 * @param String key The name of the property to set.
+	 * @param Function value A function returning the value to set.
+	 * 	 	  Scope: Current element, argument: Index of current element
+	 * @cat DOM/Attributes
 	 */
 	attr: function( key, value, type ) {
+		var obj = key;
+		
+		// Look for the case where we're accessing a style value
+		if ( key.constructor == String )
+			if ( value == undefined )
+				return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+			else {
+				obj = {};
+				obj[ key ] = value;
+			}
+		
 		// Check to see if we're setting style values
-		return typeof key != "string" || value != undefined ?
-			this.each(function(){
-				// See if we're setting a hash of styles
-				if ( value == undefined )
-					// Set all the styles
-					for ( var prop in key )
-						jQuery.attr(
-							type ? this.style : this,
-							prop, key[prop]
-						);
-
-				// See if we're setting a single key/value style
-				else
-					jQuery.attr(
-						type ? this.style : this,
-						key, value
-					);
-			}) :
-
-			// Look for the case where we're accessing a style value
-			jQuery[ type || "attr" ]( this[0], key );
+		return this.each(function(index){
+			// Set all the styles
+			for ( var prop in obj )
+				jQuery.attr(
+					type ? this.style : this,
+					prop, jQuery.prop(this, obj[prop], type, index, prop)
+				);
+		});
 	},
 
 	/**
@@ -468,16 +485,22 @@ jQuery.fn = jQuery.prototype = {
 
 	/**
 	 * Set a single style property to a value, on all matched elements.
+	 * If a number is provided, it is automatically converted into a pixel value.
 	 *
 	 * @example $("p").css("color","red");
 	 * @before <p>Test Paragraph.</p>
 	 * @result <p style="color:red;">Test Paragraph.</p>
 	 * @desc Changes the color of all paragraphs to red
 	 *
+	 * @example $("p").css("left",30);
+	 * @before <p>Test Paragraph.</p>
+	 * @result <p style="left:30px;">Test Paragraph.</p>
+	 * @desc Changes the left of all paragraphs to "30px"
+	 *
 	 * @name css
 	 * @type jQuery
 	 * @param String key The name of the property to set.
-	 * @param Object value The value to set the property to.
+	 * @param String|Number value The value to set the property to.
 	 * @cat CSS
 	 */
 	css: function( key, value ) {
@@ -496,14 +519,21 @@ jQuery.fn = jQuery.prototype = {
 	 *
 	 * @name text
 	 * @type String
-	 * @cat DOM
+	 * @cat DOM/Attributes
 	 */
 
 	/**
-	 * Set the text contents of all matched elements. This has the same
-	 * effect as html().
+	 * Set the text contents of all matched elements.
+	 *
+	 * Similar to html(), but escapes HTML (replace "<" and ">" with their
+	 * HTML entities).
+	 *
+	 * @example $("p").text("<b>Some</b> new text.");
+	 * @before <p>Test Paragraph.</p>
+	 * @result <p>&lt;b&gt;Some&lt;/b&gt; new text.</p>
+	 * @desc Sets the text of all paragraphs.
 	 *
-	 * @example $("p").text("Some new text.");
+	 * @example $("p").text("<b>Some</b> new text.", true);
 	 * @before <p>Test Paragraph.</p>
 	 * @result <p>Some new text.</p>
 	 * @desc Sets the text of all paragraphs.
@@ -511,23 +541,20 @@ jQuery.fn = jQuery.prototype = {
 	 * @name text
 	 * @type String
 	 * @param String val The text value to set the contents of the element to.
-	 * @cat DOM
+	 * @cat DOM/Attributes
 	 */
 	text: function(e) {
-		// A surprisingly high number of people expect the
-		// .text() method to do this, so lets do it!
 		if ( typeof e == "string" )
-			return this.html( e );
+			return this.empty().append( document.createTextNode( e ) );
 
-		e = e || this;
 		var t = "";
-		for ( var j = 0, el = e.length; j < el; j++ ) {
-			var r = e[j].childNodes;
-			for ( var i = 0, rl = r.length; i < rl; i++ )
-				if ( r[i].nodeType != 8 )
-					t += r[i].nodeType != 1 ?
-						r[i].nodeValue : jQuery.fn.text([ r[i] ]);
-		}
+		jQuery.each( e || this, function(){
+			jQuery.each( this.childNodes, function(){
+				if ( this.nodeType != 8 )
+					t += this.nodeType != 1 ?
+						this.nodeValue : jQuery.fn.text([ this ]);
+			});
+		});
 		return t;
 	},
 
@@ -742,7 +769,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @example $("p").find("span").end();
 	 * @before <p><span>Hello</span>, how are you?</p>
 	 * @result [ <p>...</p> ]
-	 * desc Selects all paragraphs, finds span elements inside these, and reverts the
+	 * @desc Selects all paragraphs, finds span elements inside these, and reverts the
 	 * selection back to the paragraphs.
 	 *
 	 * @name end
@@ -774,9 +801,9 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	find: function(t) {
-		return this.set( jQuery.map( this, function(a){
+		return this.pushStack( jQuery.map( this, function(a){
 			return jQuery.find(t,a);
-		}) );
+		}), t );
 	},
 
 	/**
@@ -792,10 +819,11 @@ jQuery.fn = jQuery.prototype = {
 	 *
 	 * @name clone
 	 * @type jQuery
+	 * @param Boolean deep (Optional) Set to false if you don't want to clone all descendant nodes, in addition to the element itself.
 	 * @cat DOM/Manipulation
 	 */
 	clone: function(deep) {
-		return this.set( jQuery.map( this, function(a){
+		return this.pushStack( jQuery.map( this, function(a){
 			return a.cloneNode( deep != undefined ? deep : true );
 		}) );
 	},
@@ -805,21 +833,21 @@ jQuery.fn = jQuery.prototype = {
 	 * match the specified expression(s). This method is used to narrow down
 	 * the results of a search.
 	 *
-	 * Provide a String array of expressions to apply multiple filters at once.
+	 * Provide a comma-separated list of expressions to apply multiple filters at once.
 	 *
 	 * @example $("p").filter(".selected")
 	 * @before <p class="selected">Hello</p><p>How are you?</p>
 	 * @result [ <p class="selected">Hello</p> ]
 	 * @desc Selects all paragraphs and removes those without a class "selected".
 	 *
-	 * @example $("p").filter([".selected", ":first"])
+	 * @example $("p").filter(".selected, :first")
 	 * @before <p>Hello</p><p>Hello Again</p><p class="selected">And Again</p>
 	 * @result [ <p>Hello</p>, <p class="selected">And Again</p> ]
 	 * @desc Selects all paragraphs and removes those without class "selected" and being the first one.
 	 *
 	 * @name filter
 	 * @type jQuery
-	 * @param String|Array<String> expression Expression(s) to search with.
+	 * @param String expression Expression(s) to search with.
 	 * @cat DOM/Traversing
 	 */
 	 
@@ -841,22 +869,13 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	filter: function(t) {
-		return this.set(
-			t.constructor == Array &&
-			jQuery.map(this,function(a){
-				for ( var i = 0, tl = t.length; i < tl; i++ )
-					if ( jQuery.filter(t[i],[a]).r.length )
-						return a;
-				return null;
+		return this.pushStack(
+			jQuery.isFunction( t ) &&
+			jQuery.grep(this, function(el, index){
+				return t.apply(el, [index])
 			}) ||
 
-			t.constructor == Boolean &&
-			( t ? this.get() : [] ) ||
-
-			typeof t == "function" &&
-			jQuery.grep( this, function(el, index) { return t.apply(el, [index]) }) ||
-
-			jQuery.filter(t,this).r );
+			jQuery.multiFilter(t,this) );
 	},
 
 	/**
@@ -889,18 +908,41 @@ jQuery.fn = jQuery.prototype = {
 	 * @param String expr An expression with which to remove matching elements
 	 * @cat DOM/Traversing
 	 */
+
+	/**
+	 * Removes any elements inside the array of elements from the set
+	 * of matched elements. This method is used to remove one or more
+	 * elements from a jQuery object.
+	 *
+	 * @example $("p").not( $("div p.selected") )
+	 * @before <div><p>Hello</p><p class="selected">Hello Again</p></div>
+	 * @result [ <p>Hello</p> ]
+	 * @desc Removes all elements that match "div p.selected" from the total set of all paragraphs.
+	 *
+	 * @name not
+	 * @type jQuery
+	 * @param jQuery elems A set of elements to remove from the jQuery set of matched elements.
+	 * @cat DOM/Traversing
+	 */
 	not: function(t) {
-		return this.set( typeof t == "string" ?
-			jQuery.filter(t,this,true).r :
-			jQuery.grep(this,function(a){ return a != t; }) );
+		return this.pushStack(
+			t.constructor == String &&
+			jQuery.multiFilter(t, this, true) ||
+
+			jQuery.grep(this, function(a) {
+				return ( t.constructor == Array || t.jquery )
+					? jQuery.inArray( a, t ) < 0
+					: a != t;
+			})
+		);
 	},
 
 	/**
-	 * Adds the elements matched by the expression to the jQuery object. This
-	 * can be used to concatenate the result sets of two expressions.
+	 * Adds more elements, matched by the given expression,
+	 * to the set of matched elements.
 	 *
 	 * @example $("p").add("span")
-	 * @before <p>Hello</p><p><span>Hello Again</span></p>
+	 * @before <p>Hello</p><span>Hello Again</span>
 	 * @result [ <p>Hello</p>, <span>Hello Again</span> ]
 	 *
 	 * @name add
@@ -908,19 +950,31 @@ jQuery.fn = jQuery.prototype = {
 	 * @param String expr An expression whose matched elements are added
 	 * @cat DOM/Traversing
 	 */
+	 
+	/**
+	 * Adds more elements, created on the fly, to the set of
+	 * matched elements.
+	 *
+	 * @example $("p").add("<span>Again</span>")
+	 * @before <p>Hello</p>
+	 * @result [ <p>Hello</p>, <span>Again</span> ]
+	 *
+	 * @name add
+	 * @type jQuery
+	 * @param String html A string of HTML to create on the fly.
+	 * @cat DOM/Traversing
+	 */
 
 	/**
 	 * Adds one or more Elements to the set of matched elements.
 	 *
-	 * This is used to add a set of Elements to a jQuery object.
-	 *
 	 * @example $("p").add( document.getElementById("a") )
 	 * @before <p>Hello</p><p><span id="a">Hello Again</span></p>
 	 * @result [ <p>Hello</p>, <span id="a">Hello Again</span> ]
 	 *
-	 * @example $("p").add([document.getElementById("a"), document.getElementById("b")])
-	 * @before <p>Hello</p><p><span id="a">Hello Again</span><span id="b">And Again</span></p>
-	 * @result [ <p>Hello</p>, <span id="a">Hello Again</span>, <span id="b">And Again</span> ]
+	 * @example $("p").add( document.forms[0].elements )
+	 * @before <p>Hello</p><p><form><input/><button/></form>
+	 * @result [ <p>Hello</p>, <input/>, <button/> ]
 	 *
 	 * @name add
 	 * @type jQuery
@@ -928,10 +982,13 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	add: function(t) {
-		return this.set( jQuery.merge(
-			this.get(), typeof t == "string" ?
-				jQuery.find(t) :
-				t.constructor == Array ? t : [t] ) );
+		return this.pushStack( jQuery.merge(
+			this.get(),
+			t.constructor == String ?
+				jQuery(t).get() :
+				t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+					t : [t] )
+		);
 	},
 
 	/**
@@ -987,7 +1044,9 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Attributes
 	 */
 	val: function( val ) {
-		return val == undefined ?
			( this.length ? this[0].value : null ) :
			this.attr( "value", val );
+		return val == undefined ?
+			( this.length ? this[0].value : null ) :
+			this.attr( "value", val );
 	},
 	
 	/**
@@ -1017,7 +1076,9 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Attributes
 	 */
 	html: function( val ) {
-		return val == undefined ?
			( this.length ? this[0].innerHTML : null ) :
			this.attr( "innerHTML", val );
+		return val == undefined ?
+			( this.length ? this[0].innerHTML : null ) :
+			this.empty().append( val );
 	},
 	
 	/**
@@ -1039,11 +1100,12 @@ jQuery.fn = jQuery.prototype = {
 		return this.each(function(){
 			var obj = this;
 
-			if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+			if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
 				obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
-			for ( var i = 0, al = a.length; i < al; i++ )
-				fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
+			jQuery.each( a, function(){
+				fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+			});
 
 		});
 	}
@@ -1098,7 +1160,7 @@ jQuery.fn = jQuery.prototype = {
  * @param Object prop1 The object that will be merged into the first.
  * @param Object propN (optional) More objects to merge into the first
  * @type Object
- * @cat Javascript
+ * @cat JavaScript
  */
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
@@ -1130,29 +1192,50 @@ jQuery.extend({
 	 * using the 'jQuery' variable. For example, where you used to do
 	 * $("div p"), you now must do jQuery("div p").
 	 *
-	 * @example $.noConflict();
+	 * @example jQuery.noConflict();
+	 * // Do something with jQuery
+	 * jQuery("div p").hide();
+	 * // Do something with another library's $()
+	 * $("content").style.display = 'none';
 	 * @desc Maps the original object that was referenced by $ back to $
 	 *
-	 * @example $.noConflict();
+	 * @example jQuery.noConflict();
 	 * (function($) { 
 	 *   $(function() {
 	 *     // more code using $ as alias to jQuery
 	 *   });
 	 * })(jQuery);
-	 * // other code using $ as an alias to the original implementation (not jQuery)
+	 * // other code using $ as an alias to the other library
 	 * @desc Reverts the $ alias and then creates and executes a
 	 * function to provide the $ as a jQuery alias inside the functions
 	 * scope. Inside the function the original $ object is not available.
 	 * This works well for most plugins that don't rely on any other library.
 	 * 
 	 *
-	 * @name noConflict
+	 * @name $.noConflict
 	 * @type undefined
 	 * @cat Core 
 	 */
 	noConflict: function() {
-		if(jQuery._$)
+		if ( jQuery._$ )
 			$ = jQuery._$;
+		return jQuery;
+	},
+
+	// This may seem like some crazy code, but trust me when I say that this
+	// is the only cross-browser way to do this. --John
+	isFunction: function( fn ) {
+		return !!fn && typeof fn != "string" &&
+			typeof fn[0] == "undefined" && /function/i.test( fn + "" );
+	},
+	
+	// check if an element is in a XML document
+	isXMLDoc: function(elem) {
+		return elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
 	},
 
 	/**
@@ -1161,21 +1244,27 @@ jQuery.extend({
 	 * as $().each() - which is used to iterate, exclusively, over a jQuery
 	 * object. This function can be used to iterate over anything.
 	 *
-	 * @example $.each( [0,1,2], function(i){
-	 *   alert( "Item #" + i + ": " + this );
+	 * The callback has two arguments:the key (objects) or index (arrays) as first
+	 * the first, and the value as the second.
+	 *
+	 * @example $.each( [0,1,2], function(i, n){
+	 *   alert( "Item #" + i + ": " + n );
 	 * });
-	 * @desc Iterates over the items in an array, accessing both the current item and its index.
+	 * @desc This is an example of iterating over the items in an array,
+	 * accessing both the current item and its index.
 	 *
-	 * @example $.each( { name: "John", lang: "JS" }, function(i){
-	 *   alert( "Name: " + i + ", Value: " + this );
+	 * @example $.each( { name: "John", lang: "JS" }, function(i, n){
+	 *   alert( "Name: " + i + ", Value: " + n );
 	 * });
-	 * @desc Iterates over the properties in an Object, accessing both the current item and its key.
+	 *
+	 * @desc This is an example of iterating over the properties in an
+	 * Object, accessing both the current item and its key.
 	 *
 	 * @name $.each
 	 * @param Object obj The object, or array, to iterate over.
 	 * @param Function fn The function that will be executed on every object.
 	 * @type Object
-	 * @cat Javascript
+	 * @cat JavaScript
 	 */
 	// args is for internal usage only
 	each: function( obj, fn, args ) {
@@ -1187,22 +1276,42 @@ jQuery.extend({
 				if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
 		return obj;
 	},
+	
+	prop: function(elem, value, type, index, prop){
+			// Handle executable functions
+			if ( jQuery.isFunction( value ) )
+				return value.call( elem, [index] );
+				
+			// exclude the following css properties to add px
+			var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+
+			// Handle passing in a number to a CSS property
+			return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+				value + "px" :
+				value;
+	},
 
 	className: {
+		// internal only, use addClass("class")
 		add: function( elem, c ){
 			jQuery.each( c.split(/\s+/), function(i, cur){
 				if ( !jQuery.className.has( elem.className, cur ) )
 					elem.className += ( elem.className ? " " : "" ) + cur;
 			});
 		},
+
+		// internal only, use removeClass("class")
 		remove: function( elem, c ){
-            elem.className = c ?
-                jQuery.grep( elem.className.split(/\s+/), function(cur){
-				    return !jQuery.className.has( c, cur );	
-                }).join(' ') : "";
+			elem.className = c ?
+				jQuery.grep( elem.className.split(/\s+/), function(cur){
+					return !jQuery.className.has( c, cur );	
+				}).join(" ") : "";
 		},
-		has: function( classes, c ){
-			return classes && new RegExp("(^|\\s)" + c + "(\\s|$)").test( classes );
+
+		// internal only, use is(".class")
+		has: function( t, c ) {
+			t = t.className || t;
+			return t && new RegExp("(^|\\s)" + c + "(\\s|$)").test( t );
 		}
 	},
 
@@ -1224,10 +1333,10 @@ jQuery.extend({
 		if ( p == "height" || p == "width" ) {
 			var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
 
-			for ( var i = 0, dl = d.length; i < dl; i++ ) {
-				old["padding" + d[i]] = 0;
-				old["border" + d[i] + "Width"] = 0;
-			}
+			jQuery.each( d, function(){
+				old["padding" + this] = 0;
+				old["border" + this + "Width"] = 0;
+			});
 
 			jQuery.swap( e, old, function() {
 				if (jQuery.css(e,"display") != "none") {
@@ -1263,17 +1372,16 @@ jQuery.extend({
 	curCSS: function(elem, prop, force) {
 		var ret;
 		
-		if (prop == 'opacity' && jQuery.browser.msie)
-			return jQuery.attr(elem.style, 'opacity');
+		if (prop == "opacity" && jQuery.browser.msie)
+			return jQuery.attr(elem.style, "opacity");
 			
 		if (prop == "float" || prop == "cssFloat")
 		    prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
 
-		if (!force && elem.style[prop]) {
-
+		if (!force && elem.style[prop])
 			ret = elem.style[prop];
 
-		} else if (document.defaultView && document.defaultView.getComputedStyle) {
+		else if (document.defaultView && document.defaultView.getComputedStyle) {
 
 			if (prop == "cssFloat" || prop == "styleFloat")
 				prop = "float";
@@ -1283,12 +1391,12 @@ jQuery.extend({
 
 			if ( cur )
 				ret = cur.getPropertyValue(prop);
-			else if ( prop == 'display' )
-				ret = 'none';
+			else if ( prop == "display" )
+				ret = "none";
 			else
-				jQuery.swap(elem, { display: 'block' }, function() {
-				    var c = document.defaultView.getComputedStyle(this, '');
-				    ret = c && c.getPropertyValue(prop) || '';
+				jQuery.swap(elem, { display: "block" }, function() {
+				    var c = document.defaultView.getComputedStyle(this, "");
+				    ret = c && c.getPropertyValue(prop) || "";
 				});
 
 		} else if (elem.currentStyle) {
@@ -1303,58 +1411,77 @@ jQuery.extend({
 	
 	clean: function(a) {
 		var r = [];
-		for ( var i = 0, al = a.length; i < al; i++ ) {
-			var arg = a[i];
-			if ( typeof arg == "string" ) { // Convert html string into DOM nodes
+
+		jQuery.each( a, function(i,arg){
+			if ( !arg ) return;
+
+			if ( arg.constructor == Number )
+				arg = arg.toString();
+			
+			 // Convert html string into DOM nodes
+			if ( typeof arg == "string" ) {
 				// Trim whitespace, otherwise indexOf won't work as expected
-				var s = jQuery.trim(arg), s3 = s.substring(0,3), s6 = s.substring(0,6),
-					div = document.createElement("div"), wrap = [0,"",""];
-
-				if ( s.substring(0,4) == "<opt" ) // option or optgroup
-					wrap = [1, "<select>", "</select>"];
-				else if ( s6 == "<thead" || s6 == "<tbody" || s6 == "<tfoot" )
-					wrap = [1, "<table>", "</table>"];
-				else if ( s3 == "<tr" )
-					wrap = [2, "<table><tbody>", "</tbody></table>"];
-				else if ( s3 == "<td" || s3 == "<th" ) // <thead> matched above
-					wrap = [3, "<table><tbody><tr>", "</tr></tbody></table>"];
+				var s = jQuery.trim(arg), div = document.createElement("div"), tb = [];
+
+				var wrap =
+					 // option or optgroup
+					!s.indexOf("<opt") &&
+					[1, "<select>", "</select>"] ||
+					
+					(!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot")) &&
+					[1, "<table>", "</table>"] ||
+					
+					!s.indexOf("<tr") &&
+					[2, "<table><tbody>", "</tbody></table>"] ||
+					
+				 	// <thead> matched above
+					(!s.indexOf("<td") || !s.indexOf("<th")) &&
+					[3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
+					
+					[0,"",""];
 
 				// Go to html and back, then peel off extra wrappers
 				div.innerHTML = wrap[1] + s + wrap[2];
-				while ( wrap[0]-- ) div = div.firstChild;
+				
+				// Move to the right depth
+				while ( wrap[0]-- )
+					div = div.firstChild;
 				
 				// Remove IE's autoinserted <tbody> from table fragments
 				if ( jQuery.browser.msie ) {
-					var tb = null;
+					
 					// String was a <table>, *may* have spurious <tbody>
-					if ( s6 == "<table" && s.indexOf("<tbody") < 0 ) 
+					if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
 						tb = div.firstChild && div.firstChild.childNodes;
+						
 					// String was a bare <thead> or <tfoot>
 					else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
 						tb = div.childNodes;
-					if ( tb ) {
-						for ( var n = tb.length-1; n >= 0 ; --n )
-							if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
-								tb[n].parentNode.removeChild(tb[n]);
-					}
+
+					for ( var n = tb.length-1; n >= 0 ; --n )
+						if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
+							tb[n].parentNode.removeChild(tb[n]);
+					
 				}
 				
 				arg = div.childNodes;
-			} 
-			
+			}
+
+			if ( arg.length === 0 )
+				return;
 			
-			if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function
-				for ( var n = 0, argl = arg.length; n < argl; n++ ) // Handles Array, jQuery, DOM NodeList collections
-					r.push(arg[n]);
+			if ( arg[0] == undefined )
+				r.push( arg );
 			else
-				r.push(	arg.nodeType ? arg : document.createTextNode(arg.toString()) );
-		}
+				r = jQuery.merge( r, arg );
+
+		});
 
 		return r;
 	},
 	
 	attr: function(elem, name, value){
-		var fix = {
+		var fix = jQuery.isXMLDoc(elem) ? {} : {
 			"for": "htmlFor",
 			"class": "className",
 			"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
@@ -1378,26 +1505,28 @@ jQuery.extend({
 			return elem.filter = elem.filter.replace(/alpha\([^\)]*\)/gi,"") +
 				( value == 1 ? "" : "alpha(opacity=" + value * 100 + ")" );
 
-		} else if ( name == "opacity" && jQuery.browser.msie ) {
+		} else if ( name == "opacity" && jQuery.browser.msie )
 			return elem.filter ? 
 				parseFloat( elem.filter.match(/alpha\(opacity=(.*)\)/)[1] ) / 100 : 1;
-		}
 		
 		// Mozilla doesn't play well with opacity 1
 		if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
 			value = 0.9999;
+			
+		// 
 
 		// Certain attributes only work when accessed via the old DOM 0 way
 		if ( fix[name] ) {
 			if ( value != undefined ) elem[fix[name]] = value;
 			return elem[fix[name]];
 
-		} else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
+		} else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
 			return elem.getAttributeNode(name).nodeValue;
 
 		// IE elem.getAttribute passes even for style
-		} else if ( elem.tagName ) {
-			if ( value != undefined ) elem.setAttribute( name, value );
+		else if ( elem.tagName ) {
+			if ( value != undefined ) 
+				elem.setAttribute( name, value );
 			return elem.getAttribute( name );
 
 		} else {
@@ -1416,7 +1545,7 @@ jQuery.extend({
 	 * @name $.trim
 	 * @type String
 	 * @param String str The string to trim.
-	 * @cat Javascript
+	 * @cat JavaScript
 	 */
 	trim: function(t){
 		return t.replace(/^\s+|\s+$/g, "");
@@ -1425,10 +1554,10 @@ jQuery.extend({
 	makeArray: function( a ) {
 		var r = [];
 
-		if ( a.constructor != Array ) {
+		if ( a.constructor != Array )
 			for ( var i = 0, al = a.length; i < al; i++ )
 				r.push( a[i] );
-		} else
+		else
 			r = a.slice( 0 );
 
 		return r;
@@ -1444,34 +1573,34 @@ jQuery.extend({
 	/**
 	 * Merge two arrays together, removing all duplicates.
 	 *
-	 * The new array is: All the results from the first array, followed
-	 * by the unique results from the second array.
+	 * The result is the altered first argument with
+	 * the unique elements from the second array added.
 	 *
 	 * @example $.merge( [0,1,2], [2,3,4] )
 	 * @result [0,1,2,3,4]
 	 * @desc Merges two arrays, removing the duplicate 2
 	 *
-	 * @example $.merge( [3,2,1], [4,3,2] )
-	 * @result [3,2,1,4]
+	 * @example var array = [3,2,1];
+	 * $.merge( array, [4,3,2] )
+	 * @result array == [3,2,1,4]
 	 * @desc Merges two arrays, removing the duplicates 3 and 2
 	 *
 	 * @name $.merge
 	 * @type Array
-	 * @param Array first The first array to merge.
-	 * @param Array second The second array to merge.
-	 * @cat Javascript
+	 * @param Array first The first array to merge, the unique elements of second added.
+	 * @param Array second The second array to merge into the first, unaltered.
+	 * @cat JavaScript
 	 */
 	merge: function(first, second) {
 		var r = [].slice.call( first, 0 );
 
 		// Now check for duplicates between the two arrays
 		// and only add the unique items
-		for ( var i = 0, sl = second.length; i < sl; i++ ) {
+		for ( var i = 0, sl = second.length; i < sl; i++ )
 			// Check for duplicates
 			if ( jQuery.inArray( second[i], r ) == -1 )
 				// The item is unique, add it
 				first.push( second[i] );
-		}
 
 		return first;
 	},
@@ -1494,7 +1623,7 @@ jQuery.extend({
 	 * @param Array array The Array to find items in.
 	 * @param Function fn The function to process each item against.
 	 * @param Boolean inv Invert the selection - select the opposite of the function.
-	 * @cat Javascript
+	 * @cat JavaScript
 	 */
 	grep: function(elems, fn, inv) {
 		// If a string is passed in for the function, make a function
@@ -1548,7 +1677,7 @@ jQuery.extend({
 	 * @type Array
 	 * @param Array array The Array to translate.
 	 * @param Function fn The function to process each item against.
-	 * @cat Javascript
+	 * @cat JavaScript
 	 */
 	map: function(elems, fn) {
 		// If a string is passed in for the function, make a function
@@ -1569,7 +1698,7 @@ jQuery.extend({
 			}
 		}
 
-		var r = [ result[0] ];
+		var r = result.length ? [ result[0] ] : [];
 
 		check: for ( var i = 1, rl = result.length; i < rl; i++ ) {
 			for ( var j = 0; j < i; j++ )
@@ -1604,16 +1733,16 @@ jQuery.extend({
  * @property
  * @name $.browser
  * @type Boolean
- * @cat Javascript
+ * @cat JavaScript
  */
  
 /*
- * Wheather the W3C compliant box model is being used.
+ * Whether the W3C compliant box model is being used.
  *
  * @property
  * @name $.boxModel
  * @type Boolean
- * @cat Javascript
+ * @cat JavaScript
  */
 new function() {
 	var b = navigator.userAgent.toLowerCase();
@@ -1767,17 +1896,17 @@ new function() {
  */
 jQuery.each({
 	parent: "a.parentNode",
-	parents: jQuery.parents,
-	next: "jQuery.nth(a,1,'nextSibling')",
-	prev: "jQuery.nth(a,1,'previousSibling')",
+	parents: "jQuery.parents(a)",
+	next: "jQuery.nth(a,2,'nextSibling')",
+	prev: "jQuery.nth(a,2,'previousSibling')",
 	siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
 	children: "jQuery.sibling(a.firstChild)"
 }, function(i,n){
 	jQuery.fn[ i ] = function(a) {
 		var ret = jQuery.map(this,n);
 		if ( a && typeof a == "string" )
-			ret = jQuery.filter(a,ret).r;
-		return this.set( ret );
+			ret = jQuery.multiFilter(a,ret);
+		return this.pushStack( ret );
 	};
 });
 
@@ -1794,8 +1923,9 @@ jQuery.each({
  *
  * @name appendTo
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to append to the selected element to.
  * @cat DOM/Manipulation
+ * @see append(<Content>)
  */
 
 /**
@@ -1811,8 +1941,9 @@ jQuery.each({
  *
  * @name prependTo
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to prepend to the selected element to.
  * @cat DOM/Manipulation
+ * @see prepend(<Content>)
  */
 
 /**
@@ -1828,8 +1959,9 @@ jQuery.each({
  *
  * @name insertBefore
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to insert the selected element before.
  * @cat DOM/Manipulation
+ * @see before(<Content>)
  */
 
 /**
@@ -1845,8 +1977,9 @@ jQuery.each({
  *
  * @name insertAfter
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to insert the selected element after.
  * @cat DOM/Manipulation
+ * @see after(<Content>)
  */
 
 jQuery.each({
@@ -1874,69 +2007,29 @@ jQuery.each({
  * @name removeAttr
  * @type jQuery
  * @param String name The name of the attribute to remove.
- * @cat DOM
- */
-
-/**
- * Displays each of the set of matched elements if they are hidden.
- *
- * @example $("p").show()
- * @before <p style="display: none">Hello</p>
- * @result [ <p style="display: block">Hello</p> ]
- *
- * @name show
- * @type jQuery
- * @cat Effects
+ * @cat DOM/Attributes
  */
 
 /**
- * Hides each of the set of matched elements if they are shown.
- *
- * @example $("p").hide()
- * @before <p>Hello</p>
- * @result [ <p style="display: none">Hello</p> ]
- *
- * var pass = true, div = $("div");
- * div.hide().each(function(){
- *   if ( this.style.display != "none" ) pass = false;
- * });
- * ok( pass, "Hide" );
- *
- * @name hide
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Toggles each of the set of matched elements. If they are shown,
- * toggle makes them hidden. If they are hidden, toggle
- * makes them shown.
- *
- * @example $("p").toggle()
- * @before <p>Hello</p><p style="display: none">Hello Again</p>
- * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
- *
- * @name toggle
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Adds the specified class to each of the set of matched elements.
+ * Adds the specified class(es) to each of the set of matched elements.
  *
  * @example $("p").addClass("selected")
  * @before <p>Hello</p>
  * @result [ <p class="selected">Hello</p> ]
  *
+ * @example $("p").addClass("selected highlight")
+ * @before <p>Hello</p>
+ * @result [ <p class="selected highlight">Hello</p> ]
+ *
  * @name addClass
  * @type jQuery
- * @param String class A CSS class to add to the elements
- * @cat DOM
+ * @param String class One or more CSS classes to add to the elements
+ * @cat DOM/Attributes
  * @see removeClass(String)
  */
 
 /**
- * Removes all or the specified class from the set of matched elements.
+ * Removes all or the specified class(es) from the set of matched elements.
  *
  * @example $("p").removeClass()
  * @before <p class="selected">Hello</p>
@@ -1946,10 +2039,14 @@ jQuery.each({
  * @before <p class="selected first">Hello</p>
  * @result [ <p class="first">Hello</p> ]
  *
+ * @example $("p").removeClass("selected highlight")
+ * @before <p class="highlight selected first">Hello</p>
+ * @result [ <p class="first">Hello</p> ]
+ *
  * @name removeClass
  * @type jQuery
- * @param String class (optional) A CSS class to remove from the elements
- * @cat DOM
+ * @param String class (optional) One or more CSS classes to remove from the elements
+ * @cat DOM/Attributes
  * @see addClass(String)
  */
 
@@ -1964,7 +2061,7 @@ jQuery.each({
  * @name toggleClass
  * @type jQuery
  * @param String class A CSS class with which to toggle the elements
- * @cat DOM
+ * @cat DOM/Attributes
  */
 
 /**
@@ -2004,20 +2101,6 @@ jQuery.each( {
 		jQuery.attr( this, key, "" );
 		this.removeAttribute( key );
 	},
-	show: function(){
-		this.style.display = this.oldblock ? this.oldblock : "";
-		if ( jQuery.css(this,"display") == "none" )
-			this.style.display = "block";
-	},
-	hide: function(){
-		this.oldblock = this.oldblock || jQuery.css(this,"display");
-		if ( this.oldblock == "none" )
-			this.oldblock = "block";
-		this.style.display = "none";
-	},
-	toggle: function(){
-		jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
-	},
 	addClass: function(c){
 		jQuery.className.add(this,c);
 	},
@@ -2028,7 +2111,7 @@ jQuery.each( {
 		jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
 	},
 	remove: function(a){
-		if ( !a || jQuery.filter( a, [this] ).r )
+		if ( !a || jQuery.filter( a, [this] ).r.length )
 			this.parentNode.removeChild( this );
 	},
 	empty: function() {
@@ -2102,4 +2185,72 @@ jQuery.each( [ "eq", "lt", "gt", "contains" ], function(i,n){
 	jQuery.fn[ n ] = function(num,fn) {
 		return this.filter( ":" + n + "(" + num + ")", fn );
 	};
-});
\ No newline at end of file
+});
+
+/**
+ * Get the current computed, pixel, width of the first matched element.
+ *
+ * @example $("p").width();
+ * @before <p>This is just a test.</p>
+ * @result 300
+ *
+ * @name width
+ * @type String
+ * @cat CSS
+ */
+
+/**
+ * Set the CSS width of every matched element. If no explicit unit
+ * was specified (like 'em' or '%') then "px" is added to the width.
+ *
+ * @example $("p").width(20);
+ * @before <p>This is just a test.</p>
+ * @result <p style="width:20px;">This is just a test.</p>
+ *
+ * @example $("p").width("20em");
+ * @before <p>This is just a test.</p>
+ * @result <p style="width:20em;">This is just a test.</p>
+ *
+ * @name width
+ * @type jQuery
+ * @param String|Number val Set the CSS property to the specified value.
+ * @cat CSS
+ */
+ 
+/**
+ * Get the current computed, pixel, height of the first matched element.
+ *
+ * @example $("p").height();
+ * @before <p>This is just a test.</p>
+ * @result 300
+ *
+ * @name height
+ * @type String
+ * @cat CSS
+ */
+
+/**
+ * Set the CSS width of every matched element. If no explicit unit
+ * was specified (like 'em' or '%') then "px" is added to the width.
+ *
+ * @example $("p").height(20);
+ * @before <p>This is just a test.</p>
+ * @result <p style="height:20px;">This is just a test.</p>
+ *
+ * @example $("p").height("20em");
+ * @before <p>This is just a test.</p>
+ * @result <p style="height:20em;">This is just a test.</p>
+ *
+ * @name height
+ * @type jQuery
+ * @param String|Number val Set the CSS property to the specified value.
+ * @cat CSS
+ */
+
+jQuery.each( [ "height", "width" ], function(i,n){
+	jQuery.fn[ n ] = function(h) {
+		return h == undefined ?
+			( this.length ? jQuery.css( this[0], n ) : null ) :
+			this.css( n, h.constructor == String ? h : h + "px" );
+	};
+});