X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=ebf98288d97501b8d9545b85daba30a7b2cb3e90;hb=83b43a1e927d6b260f35f75bc2c3d177f271be93;hp=5fd368aa077bf1eb3ae4d8b600b9599c81e3b12d;hpb=4dcbfc92c391983059b920d2a500c1246869f4c7;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 5fd368a..0c00829 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1,7 +1,7 @@ /* - * jQuery - New Wave Javascript + * 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. * @@ -15,135 +15,124 @@ window.undefined = window.undefined; /** * Create a new jQuery Object * - * @test ok( Array.prototype.push, "Array.push()" ); - * @test ok( Function.prototype.apply, "Function.apply()" ); - * @test ok( document.getElementById, "getElementById" ); - * @test ok( document.getElementsByTagName, "getElementsByTagName" ); - * @test ok( RegExp, "RegExp" ); - * @test ok( jQuery, "jQuery" ); - * @test ok( $, "$()" ); - * * @constructor * @private * @name jQuery + * @param String|Function|Element|Array|jQuery a selector + * @param jQuery|Element|Array c context * @cat Core */ -jQuery = function(a,c) { - - // Shortcut for document ready (because $(document).each() is silly) - if ( a && a.constructor == Function && jQuery.fn.ready ) - return jQuery(document).ready(a); - - // Make sure that a selection was provided - a = a || jQuery.context || document; - - // Watch for when a jQuery object is passed as the selector - if ( a.jquery ) - return jQuery( jQuery.merge( a, [] ) ); - - // Watch for when a jQuery object is passed at the context - if ( c && c.jquery ) - return jQuery( c ).find(a); - +var jQuery = function(a,c) { // 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 - var m = /^[^<]*(<.+>)[^>]*$/.exec(a); - if ( m ) a = jQuery.clean( [ m[1] ] ); - - // Watch for when an array is passed in - this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ? - // Assume that it is an array of DOM Elements - jQuery.merge( a, [] ) : - - // Find the matching elements and save them for later - jQuery.find( a, c ) ); + if ( typeof a == "string" ) { + // 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 || - // See if an extra function was provided - var fn = arguments[ arguments.length - 1 ]; + // 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 ) || - // If so, execute it in context - if ( fn && fn.constructor == Function ) - this.each(fn); + // HANDLE: $(*) + [ a ] ); }; // Map over the $ in case of overwrite if ( typeof $ != "undefined" ) jQuery._$ = $; + +// Map the jQuery namespace to the '$' one +var $ = jQuery; /** - * This function accepts a string containing a CSS selector, - * basic XPath, or raw HTML, which is then used to match a set of elements. - * The HTML string is different from the traditional selectors in that - * it creates the DOM elements representing that HTML string, on the fly, - * to be (assumedly) inserted into the document later. + * This function accepts a string containing a CSS or + * basic XPath selector which is then used to match a set of elements. * * The core functionality of jQuery centers around this function. * Everything in jQuery is based upon this, or uses this in some way. * The most basic use of this function is to pass in an expression * (usually consisting of CSS or XPath), which then finds all matching - * elements and remembers them for later use. + * elements. + * + * By default, if no context is specified, $() looks for DOM elements within the context of the + * current HTML document. If you do specify a context, such as a DOM + * element or jQuery object, the expression will be matched against + * the contents of that context. * - * By default, $() looks for DOM elements within the context of the - * current HTML document. + * See [[DOM/Traversing/Selectors]] for the allowed CSS/XPath syntax for expressions. * * @example $("div > p") - * @desc This finds all p elements that are children of a div element. + * @desc Finds all p elements that are children of a div element. * @before

one

two

three

* @result [

two

] * - * @example $("

Hello

").appendTo("#body") - * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body. + * @example $("input:radio", document.forms[0]) + * @desc Searches for all inputs of type radio within the first form in the document + * + * @example $("div", xml.responseXML) + * @desc This finds all div elements within the specified XML document. * * @name $ - * @param String expr An expression to search with, or a string of HTML to create on the fly. + * @param String expr An expression to search with + * @param Element|jQuery context (optional) A DOM Element, Document or jQuery to use as context * @cat Core * @type jQuery + * @see $(Element) + * @see $(Element) */ - + /** - * This function accepts a string containing a CSS selector, or - * basic XPath, which is then used to match a set of elements with the - * context of the specified DOM element, or document + * Create DOM elements on-the-fly from the provided String of raw HTML. * - * @example $("div", xml.responseXML) - * @desc This finds all div elements within the specified XML document. + * @example $("

Hello

").appendTo("body") + * @desc Creates a div element (and all of its contents) dynamically, + * and appends it to the body element. Internally, an + * element is created and its innerHTML property set to the given markup. + * It is therefore both quite flexible and limited. * * @name $ - * @param String expr An expression to search with. - * @param Element context A DOM Element, or Document, representing the base context. + * @param String html A string of HTML to create on the fly. * @cat Core * @type jQuery + * @see appendTo(String) */ /** - * Wrap jQuery functionality around a specific DOM Element. + * Wrap jQuery functionality around a single or multiple DOM Element(s). + * * 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

one

two

three

- * @result [

two

] - * - * @example $(document.body).background( "black" ); + * @example $(document.body).css( "background", "black" ); * @desc Sets the background color of the page to black. * - * @name $ - * @param Element elem A DOM element to be encapsulated by a jQuery object. - * @cat Core - * @type jQuery - */ - -/** - * Wrap jQuery functionality around a set of DOM Elements. - * * @example $( myForm.elements ).hide() * @desc Hides all the input elements within a form * * @name $ - * @param Array elems An array of DOM elements to be encapsulated by a jQuery object. + * @param Element|Array elems DOM element(s) to be encapsulated by a jQuery object. * @cat Core * @type jQuery */ @@ -152,41 +141,36 @@ if ( typeof $ != "undefined" ) * A shorthand for $(document).ready(), allowing you to bind a function * to be executed when the DOM document has finished loading. This function * behaves just like $(document).ready(), in that it should be used to wrap - * all of the other $() operations on your page. While this function is, - * technically, chainable - there really isn't much use for chaining against it. + * other $() operations on your page that depend on the DOM being ready to be + * operated on. While this function is, technically, chainable - there really + * isn't much use for chaining against it. + * + * You can have as many $(document).ready events on your page as you like. * + * See ready(Function) for details about the ready event. + * * @example $(function(){ * // Document is ready * }); * @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) */ -// Map the jQuery namespace to the '$' one -var $ = jQuery; - jQuery.fn = jQuery.prototype = { /** - * The current SVN version of jQuery. + * The current version of jQuery. * * @private * @property @@ -194,17 +178,15 @@ jQuery.fn = jQuery.prototype = { * @type String * @cat Core */ - jquery: "$Rev$", + jquery: "@VERSION", /** - * The number of elements currently matched. + * The number of elements currently matched. The size function will return the same value. * * @example $("img").length; * @before * @result 2 * - * @test ok( $("div").length == 2, "Get Number of Elements Found" ); - * * @property * @name length * @type Number @@ -212,14 +194,13 @@ jQuery.fn = jQuery.prototype = { */ /** - * The number of elements currently matched. + * Get the number of elements currently matched. This returns the same + * number as the 'length' property of the jQuery object. * * @example $("img").size(); * @before * @result 2 * - * @test ok( $("div").size() == 2, "Get Number of Elements Found" ); - * * @name size * @type Number * @cat Core @@ -227,17 +208,20 @@ jQuery.fn = jQuery.prototype = { size: function() { return this.length; }, + + length: 0, /** - * Access all matched elements. This serves as a backwards-compatible + * Access all matched DOM elements. This serves as a backwards-compatible * way of accessing all matched elements (other than the jQuery object * itself, which is, in fact, an array of elements). * + * It is useful if you need to operate on the DOM elements themselves instead of using built-in jQuery functions. + * * @example $("img").get(); * @before * @result [ ] - * - * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" ); + * @desc Selects all images in the document and returns the DOM Elements as an Array * * @name get * @type Array @@ -245,82 +229,85 @@ jQuery.fn = jQuery.prototype = { */ /** - * Access a single matched element. num is used to access the - * Nth element matched. + * Access a single matched DOM element at a specified index in the matched set. + * This allows you to extract the actual DOM element and operate on it + * directly without necessarily using jQuery functionality on it. * - * @example $("img").get(1); + * @example $("img").get(0); * @before - * @result [ ] - * - * @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" ); + * @result + * @desc Selects all images in the document and returns the first one * * @name get * @type Element * @param Number num Access the element in the Nth position. * @cat Core */ + get: function( num ) { + return num == undefined ? + + // Return a 'clean' array + jQuery.makeArray( this ) : + // Return just the object + this[num]; + }, + /** - * Set the jQuery object to an array of elements. + * Set the jQuery object to an array of elements, while maintaining + * the stack. * - * @example $("img").get([ document.body ]); - * @result $("img").get() == [ document.body ] + * @example $("img").pushStack([ document.body ]); + * @result $("img").pushStack() == [ document.body ] * * @private - * @name get + * @name pushStack * @type jQuery * @param Elements elems An array of elements * @cat Core */ - get: function( num ) { - // Watch for when an array (of elements) is passed in - if ( num && num.constructor == Array ) { - - // Use a tricky hack to make the jQuery object - // look and feel like an array - this.length = 0; - [].push.apply( this, num ); - - return this; - } else - return num == undefined ? - - // Return a 'clean' array - jQuery.merge( this, [] ) : - - // Return just the object - this[num]; + pushStack: function( a ) { + var ret = jQuery(a); + ret.prevObject = this; + return ret; + }, + + /** + * Set the jQuery object to an array of elements. This operation is + * completely destructive - be sure to use .pushStack() if you wish to maintain + * the jQuery stack. + * + * @example $("img").setArray([ document.body ]); + * @result $("img").setArray() == [ document.body ] + * + * @private + * @name setArray + * @type jQuery + * @param Elements elems An array of elements + * @cat Core + */ + setArray: function( a ) { + this.length = 0; + [].push.apply( this, a ); + return this; }, /** * Execute a function within the context of every matched element. * This means that every time the passed-in function is executed * (which is once for every element matched) the 'this' keyword - * points to the specific element. + * points to the specific DOM element. * * Additionally, the function, when executed, is passed a single * argument representing the position of the element in the matched - * set. - * - * @example $("img").each(function(){ - * this.src = "test.jpg"; - * }); - * @before - * @result + * set (integer, zero-index). * * @example $("img").each(function(i){ - * alert( "Image #" + i + " is " + this ); + * this.src = "test" + i + ".jpg"; * }); - * @before - * @result - * - * @test var div = $("div"); - * div.each(function(){this.foo = 'zoo';}); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).foo != "zoo" ) pass = false; - * } - * ok( pass, "Execute a function, Relative" ); + * @before + * @result + * @desc Iterates over two images and sets their src property * * @name each * @type jQuery @@ -336,31 +323,24 @@ jQuery.fn = jQuery.prototype = { * the index of the element, if found, starting with zero. * Returns -1 if the object wasn't found. * - * @example $("*").index(document.getElementById('foobar')) - * @before
+ * @example $("*").index( $('#foobar')[0] ) + * @before
* @result 0 + * @desc Returns the index for the element with ID foobar * - * @example $("*").index(document.getElementById('foo')) - * @before
+ * @example $("*").index( $('#foo')[0] ) + * @before
* @result 2 + * @desc Returns the index for the element with ID foo within another element * - * @example $("*").index(document.getElementById('bar')) - * @before
+ * @example $("*").index( $('#bar')[0] ) + * @before
* @result -1 + * @desc Returns -1, as there is no element with ID bar * - * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" ); - * @test ok( $([window, document]).index(document) == 1, "Check for index of elements" ); - * @test var inputElements = $('#radio1,#radio2,#check1,#check2'); - * @test ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" ); - * @test ok( inputElements.index(window) == -1, "Check for not found index" ); - * @test ok( inputElements.index(document) == -1, "Check for not found index" ); - * * @name index * @type Number - * @param Object obj Object to search for + * @param Element subject Object to search for * @cat Core */ index: function( obj ) { @@ -376,101 +356,101 @@ jQuery.fn = jQuery.prototype = { * This method makes it easy to retrieve a property value * from the first matched element. * + * If the element does not have an attribute with such a + * name, undefined is returned. + * * @example $("img").attr("src"); * @before * @result test.jpg + * @desc Returns the src attribute from the first image in the document. * - * @test ok( $('#text1').attr('value') == "Test", 'Check for value attribute' ); - * @test ok( $('#text1').attr('type') == "text", 'Check for type attribute' ); - * @test ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' ); - * @test ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' ); - * @test ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' ); - * @test ok( $('#google').attr('title') == "Google!", 'Check for title attribute' ); - * @test ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' ); - * @test ok( $('#en').attr('lang') == "en", 'Check for lang attribute' ); - * @test ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' ); - * @test ok( $('#name').attr('name') == "name", 'Check for name attribute' ); - * @test ok( $('#text1').attr('name') == "action", 'Check for name attribute' ); - * @test ok( $('#form').attr('action') == "formaction", 'Check for action attribute' ); - * * @name attr * @type Object * @param String name The name of the property to access. - * @cat DOM + * @cat DOM/Attributes */ /** - * Set a hash of key/value object properties to all matched elements. + * Set a key/value object as properties to all matched elements. + * * This serves as the best way to set a large number of properties * on all matched elements. * * @example $("img").attr({ src: "test.jpg", alt: "Test Image" }); * @before * @result Test Image - * - * @test var pass = true; - * $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){ - * if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false; - * }); - * ok( pass, "Set Multiple Attributes" ); + * @desc Sets src and alt attributes to all images. * * @name attr * @type jQuery - * @param Hash prop A set of key/value pairs to set as object properties. - * @cat DOM + * @param Map properties Key/value pairs to set as object properties. + * @cat DOM/Attributes */ /** * Set a single property to a value, on all matched elements. * + * 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. + * * @example $("img").attr("src","test.jpg"); * @before * @result - * - * @test var div = $("div"); - * div.attr("foo", "bar"); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false; - * } - * ok( pass, "Set Attribute" ); - * - * @test $("#name").attr('name', 'something'); - * ok( $("#name").name() == 'something', 'Set name attribute' ); - * @test $("#check2").attr('checked', true); - * ok( document.getElementById('check2').checked == true, 'Set checked attribute' ); - * $("#check2").attr('checked', false); - * ok( document.getElementById('check2').checked == false, 'Set checked attribute' ); + * @desc Sets src attribute to all images. * * @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 supplying a string value as described + * [[DOM/Attributes#attr.28_key.2C_value_.29|above]], + * a function is provided that computes the value. + * + * @example $("img").attr("title", function() { return this.src }); + * @before + * @result + * @desc Sets title attribute from src attribute. + * + * @example $("img").attr("title", function(index) { return this.title + (i + 1); }); + * @before + * @result + * @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 key.constructor != 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) + ); + }); }, /** @@ -480,67 +460,55 @@ jQuery.fn = jQuery.prototype = { * * @example $("p").css("color"); * @before

Test Paragraph.

- * @result red + * @result "red" * @desc Retrieves the color style of the first paragraph * - * @example $("p").css("fontWeight"); + * @example $("p").css("font-weight"); * @before

Test Paragraph.

- * @result bold + * @result "bold" * @desc Retrieves the font-weight style of the first paragraph. - * Note that for all style properties with a dash (like 'font-weight'), you have to - * write it in camelCase. In other words: Every time you have a '-' in a - * property, remove it and replace the next character with an uppercase - * representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth, - * borderStyle, borderBottomWidth etc. - * - * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"'); * * @name css - * @type Object + * @type String * @param String name The name of the property to access. * @cat CSS */ /** - * Set a hash of key/value style properties to all matched elements. + * Set a key/value object as style properties to all matched elements. + * * This serves as the best way to set a large number of style properties * on all matched elements. * * @example $("p").css({ color: "red", background: "blue" }); * @before

Test Paragraph.

* @result

Test Paragraph.

+ * @desc Sets color and background styles to all p elements. * - * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - * @test $('#foo').css({display: 'none'}); - * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - * @test $('#foo').css({display: 'block'}); - * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); - * * @name css * @type jQuery - * @param Hash prop A set of key/value pairs to set as style properties. + * @param Map properties Key/value pairs to set as style properties. * @cat CSS */ /** * 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

Test Paragraph.

* @result

Test Paragraph.

* @desc Changes the color of all paragraphs to red * - * - * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - * @test $('#foo').css('display', 'none'); - * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - * @test $('#foo').css('display', 'block'); - * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); + * @example $("p").css("left",30); + * @before

Test Paragraph.

+ * @result

Test Paragraph.

+ * @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 ) { @@ -548,31 +516,53 @@ jQuery.fn = jQuery.prototype = { }, /** - * Retrieve the text contents of all matched elements. The result is + * Get the text contents of all matched elements. The result is * a string that contains the combined text contents of all matched * elements. This method works on both HTML and XML documents. * * @example $("p").text(); + * @before

Test Paragraph.

Paraparagraph

+ * @result Test Paragraph.Paraparagraph + * @desc Gets the concatenated text of all paragraphs + * + * @name text + * @type String + * @cat DOM/Attributes + */ + + /** + * Set the text contents of all matched elements. + * + * Similar to html(), but escapes HTML (replace "<" and ">" with their + * HTML entities). + * + * @example $("p").text("Some new text."); * @before

Test Paragraph.

- * @result Test Paragraph. + * @result

<b>Some</b> new text.

+ * @desc Sets the text of all paragraphs. * - * @test var expected = "This link has class=\"blog\": Simon Willison's Weblog"; - * ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' ); + * @example $("p").text("Some new text.", true); + * @before

Test Paragraph.

+ * @result

Some new text.

+ * @desc Sets the text of all paragraphs. * * @name text * @type String - * @cat DOM + * @param String val The text value to set the contents of the element to. + * @cat DOM/Attributes */ text: function(e) { - e = e || this; + if ( typeof e == "string" ) + return this.empty().append( document.createTextNode( e ) ); + var t = ""; - for ( var j = 0; j < e.length; j++ ) { - var r = e[j].childNodes; - for ( var i = 0; i < r.length; 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; }, @@ -594,11 +584,6 @@ jQuery.fn = jQuery.prototype = { * @before

Test Paragraph.

* @result

Test Paragraph.

* - * @test var defaultText = 'Try them out:' - * var result = $('#first').wrap('
').text(); - * ok( defaultText == result, 'Check for wrapping of on-the-fly html' ); - * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' ); - * * @name wrap * @type jQuery * @param String html A string of HTML, that will be created on the fly and wrapped around the target. @@ -622,14 +607,9 @@ jQuery.fn = jQuery.prototype = { * @before

Test Paragraph.

* @result

Test Paragraph.

* - * @test var defaultText = 'Try them out:' - * var result = $('#first').wrap(document.getElementById('empty')).parent(); - * ok( result.is('ol'), 'Check for element wrapping' ); - * ok( result.text() == defaultText, 'Check for element wrapping' ); - * * @name wrap * @type jQuery - * @param Element elem A DOM element that will be wrapped. + * @param Element elem A DOM element that will be wrapped around the target. * @cat DOM/Manipulation */ wrap: function() { @@ -644,7 +624,7 @@ jQuery.fn = jQuery.prototype = { // Insert it before the element to be wrapped this.parentNode.insertBefore( b, this ); - // Find he deepest point in the wrap structure + // Find the deepest point in the wrap structure while ( b.firstChild ) b = b.firstChild; @@ -654,67 +634,33 @@ jQuery.fn = jQuery.prototype = { }, /** - * Append any number of elements to the inside of every matched elements, - * generated from the provided HTML. + * Append content to the inside of every matched element. + * * This operation is similar to doing an appendChild to all the * specified elements, adding them into the document. * * @example $("p").append("Hello"); * @before

I would like to say:

* @result

I would like to say: Hello

- * - * @test var defaultText = 'Try them out:' - * var result = $('#first').append('buga'); - * ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); - * - * @test reset(); - * var expected = "Try them out: bla "; - * $('#first').append(" "); - * $('#first').append("bla "); - * ok( expected == $('#first').text(), "Check for appending of spaces" ); - * - * @name append - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Append an element to the inside of all matched elements. - * This operation is similar to doing an appendChild to all the - * specified elements, adding them into the document. + * @desc Appends some HTML to all paragraphs. * * @example $("p").append( $("#foo")[0] ); * @before

I would like to say:

Hello * @result

I would like to say: Hello

- * - * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:"; - * $('#sap').append(document.getElementById('first')); - * ok( expected == $('#sap').text(), "Check for appending of element" ); - * - * @name append - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Append any number of elements to the inside of all matched elements. - * This operation is similar to doing an appendChild to all the - * specified elements, adding them into the document. + * @desc Appends an Element to all paragraphs. * * @example $("p").append( $("b") ); * @before

I would like to say:

Hello * @result

I would like to say: Hello

- * - * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; - * $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]); - * ok( expected == $('#sap').text(), "Check for appending of array of elements" ); + * @desc Appends a jQuery object (similar to an Array of DOM Elements) to all paragraphs. * * @name append * @type jQuery - * @param Array elems An array of elements, all of which will be appended. + * @param content Content to append to the target * @cat DOM/Manipulation + * @see prepend() + * @see before() + * @see after() */ append: function() { return this.domManip(arguments, true, 1, function(a){ @@ -723,118 +669,65 @@ jQuery.fn = jQuery.prototype = { }, /** - * Prepend any number of elements to the inside of every matched elements, - * generated from the provided HTML. - * This operation is the best way to insert dynamically created elements - * inside, at the beginning, of all the matched element. + * Prepend content to the inside of every matched element. + * + * This operation is the best way to insert elements + * inside, at the beginning, of all matched elements. * * @example $("p").prepend("Hello"); * @before

I would like to say:

* @result

HelloI would like to say:

- * - * @test var defaultText = 'Try them out:' - * var result = $('#first').prepend('buga'); - * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' ); - * - * @name prepend - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Prepend an element to the inside of all matched elements. - * This operation is the best way to insert an element inside, at the - * beginning, of all the matched element. + * @desc Prepends some HTML to all paragraphs. * * @example $("p").prepend( $("#foo")[0] ); * @before

I would like to say:

Hello * @result

HelloI would like to say:

- * - * @test var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog"; - * $('#sap').prepend(document.getElementById('first')); - * ok( expected == $('#sap').text(), "Check for prepending of element" ); - * - * @name prepend - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Prepend any number of elements to the inside of all matched elements. - * This operation is the best way to insert a set of elements inside, at the - * beginning, of all the matched element. - * + * @desc Prepends an Element to all paragraphs. + * * @example $("p").prepend( $("b") ); * @before

I would like to say:

Hello * @result

HelloI would like to say:

- * - * @test var expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; - * $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]); - * ok( expected == $('#sap').text(), "Check for prepending of array of elements" ); + * @desc Prepends a jQuery object (similar to an Array of DOM Elements) to all paragraphs. * * @name prepend * @type jQuery - * @param Array elems An array of elements, all of which will be appended. + * @param content Content to prepend to the target. * @cat DOM/Manipulation + * @see append() + * @see before() + * @see after() */ prepend: function() { return this.domManip(arguments, true, -1, function(a){ this.insertBefore( a, this.firstChild ); }); }, - + /** - * Insert any number of dynamically generated elements before each of the - * matched elements. + * Insert content before each of the matched elements. * * @example $("p").before("Hello"); * @before

I would like to say:

* @result Hello

I would like to say:

- * - * @test var expected = 'This is a normal link: bugaYahoo'; - * $('#yahoo').before('buga'); - * ok( expected == $('#en').text(), 'Insert String before' ); - * - * @name before - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Insert an element before each of the matched elements. + * @desc Inserts some HTML before all paragraphs. * * @example $("p").before( $("#foo")[0] ); * @before

I would like to say:

Hello * @result Hello

I would like to say:

- * - * @test var expected = "This is a normal link: Try them out:Yahoo"; - * $('#yahoo').before(document.getElementById('first')); - * ok( expected == $('#en').text(), "Insert element before" ); - * - * @name before - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Insert any number of elements before each of the matched elements. + * @desc Inserts an Element before all paragraphs. * * @example $("p").before( $("b") ); * @before

I would like to say:

Hello * @result Hello

I would like to say:

- * - * @test var expected = "This is a normal link: Try them out:diveintomarkYahoo"; - * $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]); - * ok( expected == $('#en').text(), "Insert array of elements before" ); + * @desc Inserts a jQuery object (similar to an Array of DOM Elements) before all paragraphs. * * @name before * @type jQuery - * @param Array elems An array of elements, all of which will be appended. + * @param content Content to insert before each target. * @cat DOM/Manipulation + * @see append() + * @see prepend() + * @see after() */ before: function() { return this.domManip(arguments, false, 1, function(a){ @@ -843,55 +736,30 @@ jQuery.fn = jQuery.prototype = { }, /** - * Insert any number of dynamically generated elements after each of the - * matched elements. + * Insert content after each of the matched elements. * * @example $("p").after("Hello"); * @before

I would like to say:

* @result

I would like to say:

Hello - * - * @test var expected = 'This is a normal link: Yahoobuga'; - * $('#yahoo').after('buga'); - * ok( expected == $('#en').text(), 'Insert String after' ); - * - * @name after - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Insert an element after each of the matched elements. + * @desc Inserts some HTML after all paragraphs. * * @example $("p").after( $("#foo")[0] ); * @before Hello

I would like to say:

* @result

I would like to say:

Hello - * - * @test var expected = "This is a normal link: YahooTry them out:"; - * $('#yahoo').after(document.getElementById('first')); - * ok( expected == $('#en').text(), "Insert element after" ); - * - * @name after - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Insert any number of elements after each of the matched elements. + * @desc Inserts an Element after all paragraphs. * * @example $("p").after( $("b") ); * @before Hello

I would like to say:

* @result

I would like to say:

Hello - * - * @test var expected = "This is a normal link: YahooTry them out:diveintomark"; - * $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]); - * ok( expected == $('#en').text(), "Insert array of elements after" ); + * @desc Inserts a jQuery object (similar to an Array of DOM Elements) after all paragraphs. * * @name after * @type jQuery - * @param Array elems An array of elements, all of which will be appended. + * @param content Content to insert after each target. * @cat DOM/Manipulation + * @see append() + * @see prepend() + * @see before() */ after: function() { return this.domManip(arguments, false, -1, function(a){ @@ -900,27 +768,35 @@ jQuery.fn = jQuery.prototype = { }, /** - * End the most recent 'destructive' operation, reverting the list of matched elements - * back to its previous state. After an end operation, the list of matched elements will - * revert to the last state of matched elements. + * Revert the most recent 'destructive' operation, changing the set of matched elements + * to its previous state (right before the destructive operation). + * + * If there was no destructive operation before, an empty set is returned. + * + * A 'destructive' operation is any operation that changes the set of + * matched jQuery elements. These functions are: add, + * children, clone, filter, + * find, not, next, + * parent, parents, prev and siblings. * * @example $("p").find("span").end(); * @before

Hello, how are you?

- * @result $("p").find("span").end() == [

...

] - * - * @test ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' ); + * @result [

...

] + * @desc Selects all paragraphs, finds span elements inside these, and reverts the + * selection back to the paragraphs. * * @name end * @type jQuery * @cat DOM/Traversing */ end: function() { - return this.get( this.stack.pop() ); + return this.prevObject || jQuery([]); }, /** * Searches for all elements that match the specified expression. - * This method is the optimal way of finding additional descendant + + * This method is a good way to find additional descendant * elements with which to process. * * All searching is done using a jQuery expression. The expression can be @@ -928,9 +804,9 @@ jQuery.fn = jQuery.prototype = { * * @example $("p").find("span"); * @before

Hello, how are you?

- * @result $("p").find("span") == [ Hello ] - * - * @test ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' ); + * @result [ Hello ] + * @desc Starts with all paragraphs and searches for descendant span + * elements, same as $("p span") * * @name find * @type jQuery @@ -940,98 +816,91 @@ jQuery.fn = jQuery.prototype = { find: function(t) { return this.pushStack( jQuery.map( this, function(a){ return jQuery.find(t,a); - }), arguments ); + }), t ); }, /** - * Create cloned copies of all matched DOM Elements. This does - * not create a cloned copy of this particular jQuery object, - * instead it creates duplicate copies of all DOM Elements. + * Clone matched DOM Elements and select the clones. + * * This is useful for moving copies of the elements to another * location in the DOM. * * @example $("b").clone().prependTo("p"); * @before Hello

, how are you?

* @result Hello

Hello, how are you?

- * - * @test ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' ); - * var clone = $('#yahoo').clone(); - * ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' ); - * ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' ); + * @desc Clones all b elements (and selects the clones) and prepends them to all paragraphs. * * @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.pushStack( jQuery.map( this, function(a){ - return a.cloneNode( deep != undefined ? deep : true ); - }), arguments ); + var a = a.cloneNode( deep != undefined ? deep : true ); + a.$events = null; // drop $events expando to avoid firing incorrect events + return a; + }) ); }, /** * Removes all elements from the set of matched elements that do not - * match the specified expression. This method is used to narrow down + * match the specified expression(s). This method is used to narrow down * the results of a search. * - * All searching is done using a jQuery expression. The expression - * can be written using CSS 1-3 Selector syntax, or basic XPath. + * Provide a comma-separated list of expressions to apply multiple filters at once. * * @example $("p").filter(".selected") * @before

Hello

How are you?

- * @result $("p").filter(".selected") == [

Hello

] + * @result [

Hello

] + * @desc Selects all paragraphs and removes those without a class "selected". * - * @test isSet( $("input").filter(":checked").get(), q("radio2", "check1"), "Filter elements" ); + * @example $("p").filter(".selected, :first") + * @before

Hello

Hello Again

And Again

+ * @result [

Hello

,

And Again

] + * @desc Selects all paragraphs and removes those without class "selected" and being the first one. * * @name filter * @type jQuery - * @param String expr An expression to search with. + * @param String expression Expression(s) to search with. * @cat DOM/Traversing */ - + /** * Removes all elements from the set of matched elements that do not - * match at least one of the expressions passed to the function. This - * method is used when you want to filter the set of matched elements - * through more than one expression. - * - * Elements will be retained in the jQuery object if they match at - * least one of the expressions passed. + * pass the specified filter. This method is used to narrow down + * the results of a search. * - * @example $("p").filter([".selected", ":first"]) - * @before

Hello

Hello Again

And Again

- * @result $("p").filter([".selected", ":first"]) == [

Hello

,

And Again

] + * @example $("p").filter(function(index) { + * return $("ol", this).length == 0; + * }) + * @before

  1. Hello

How are you?

+ * @result [

How are you?

] + * @desc Remove all elements that have a child ol element * * @name filter * @type jQuery - * @param Array exprs A set of expressions to evaluate against + * @param Function filter A function to use for filtering * @cat DOM/Traversing */ filter: function(t) { return this.pushStack( - t.constructor == Array && - jQuery.map(this,function(a){ - for ( var i = 0; i < t.length; i++ ) - if ( jQuery.filter(t[i],[a]).r.length ) - return a; + jQuery.isFunction( t ) && + jQuery.grep(this, function(el, index){ + return t.apply(el, [index]) }) || - t.constructor == Boolean && - ( t ? this.get() : [] ) || - - t.constructor == Function && - jQuery.grep( this, t ) || - - jQuery.filter(t,this).r, arguments ); + jQuery.multiFilter(t,this) ); }, /** * Removes the specified Element from the set of matched elements. This * method is used to remove a single Element from a jQuery object. * - * @example $("p").not( document.getElementById("selected") ) + * @example $("p").not( $("#selected")[0] ) * @before

Hello

Hello Again

* @result [

Hello

] + * @desc Removes the element with the ID "selected" from the set of all paragraphs. * * @name not * @type jQuery @@ -1047,69 +916,111 @@ jQuery.fn = jQuery.prototype = { * @example $("p").not("#selected") * @before

Hello

Hello Again

* @result [

Hello

] - * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not") + * @desc Removes the element with the ID "selected" from the set of all paragraphs. * * @name not * @type jQuery * @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. + * + * Please note: the expression cannot use a reference to the + * element name. See the two examples below. + * + * @example $("p").not( $("div p.selected") ) + * @before

Hello

Hello Again

+ * @result [

Hello

] + * @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.pushStack( t.constructor == String ? - jQuery.filter(t,this,false).r : - jQuery.grep(this,function(a){ return a != t; }), arguments ); + 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

Hello

Hello Again

- * @result [

Hello

, Hello Again ] + * @before (HTML)

Hello

Hello Again + * @result (jQuery object matching 2 elements) [

Hello

, Hello Again ] + * @desc Compare the above result to the result of $('p'), + * which would just result in [

Hello

]
. + * Using add(), matched elements of $('span') are simply + * added to the returned jQuery-object. * * @name add * @type jQuery * @param String expr An expression whose matched elements are added * @cat DOM/Traversing */ - + /** - * Adds each of the Elements in the array to the set of matched elements. - * This is used to add a set of Elements to a jQuery object. + * Adds more elements, created on the fly, to the set of + * matched elements. * - * @example $("p").add([document.getElementById("a"), document.getElementById("b")]) - * @before

Hello

Hello AgainAnd Again

- * @result [

Hello

, Hello Again, And Again ] + * @example $("p").add("Again") + * @before

Hello

+ * @result [

Hello

, Again ] * * @name add * @type jQuery - * @param Array els An array of Elements to add + * @param String html A string of HTML to create on the fly. * @cat DOM/Traversing */ /** - * Adds a single Element to the set of matched elements. This is used to - * add a single Element to a jQuery object. + * Adds one or more Elements to the set of matched elements. * * @example $("p").add( document.getElementById("a") ) * @before

Hello

Hello Again

* @result [

Hello

, Hello Again ] * + * @example $("p").add( document.forms[0].elements ) + * @before

Hello