X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=4e8f7d565254710b18476feb7edb4324b4b323e3;hb=3abf3125cb737f120b6b86c6011fd7ce0e6ba7cc;hp=ee65edbb1f8dd857b43d55a4ec69b82cfbe16bee;hpb=ea283bd13130303271077a6ee8b14b7c79bd0ce4;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index ee65edb..537b4e2 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. * @@ -9,243 +9,86 @@ * $Rev$ */ -// Global undefined variable -window.undefined = window.undefined; +// Map over jQuery in case of overwrite +if ( typeof jQuery != "undefined" ) + var _jQuery = jQuery; -/** - * Create a new jQuery Object - * - * @constructor - * @private - * @name jQuery - * @param String|Function|Element|Array|jQuery a selector - * @param jQuery|Element|Array c context - * @cat Core - */ -var jQuery = function(a,c) { +var jQuery = window.jQuery = function(a,c) { // If the context is global, return a new object - if ( window == this ) + if ( window == this || !this.init ) return new jQuery(a,c); - - // Make sure that a selection was provided - a = a || document; - - // HANDLE: $(function) - // Shortcut for document ready - // Safari reports typeof on DOM NodeLists as a function - if ( typeof a == "function" && !a.nodeType && a[0] == undefined ) - return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a ); - - // Handle HTML strings - if ( typeof a == "string" ) { - // HANDLE: $(html) -> $(array) - var m = /^[^<]*(<.+>)[^>]*$/.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 || - - // 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 ) || - - // HANDLE: $(*) - [ a ] ); + return this.init(a,c); }; // Map over the $ in case of overwrite if ( typeof $ != "undefined" ) - jQuery._$ = $; + var _$ = $; // Map the jQuery namespace to the '$' one -var $ = jQuery; +window.$ = jQuery; -/** - * 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. - * - * By default, $() looks for DOM elements within the context of the - * current HTML document. - * - * @example $("div > p") - * @desc Finds all p elements that are children of a div element. - * @before

one

two

three

- * @result [

two

] - * - * @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 - * @param Element|jQuery context (optional) A DOM Element, Document or jQuery to use as context - * @cat Core - * @type jQuery - * @see $(Element) - * @see $(Element) - */ - -/** - * Create DOM elements on-the-fly from the provided String of raw HTML. - * - * @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. Internally, an - * element is created and it's innerHTML property set to the given markup. - * It is therefore both quite flexible and limited. - * - * @name $ - * @param String html A string of HTML to create on the fly. - * @cat Core - * @type jQuery - * @see appendTo(String) - */ +var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; -/** - * 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

] - * @desc Same as $("div > p") because the document - * - * @example $(document.body).background( "black" ); - * @desc Sets the background color of the page to black. - * - * @example $( myForm.elements ).hide() - * @desc Hides all the input elements within a form - * - * @name $ - * @param Element|Array elems DOM element(s) to be encapsulated by a jQuery object. - * @cat Core - * @type jQuery - */ +jQuery.fn = jQuery.prototype = { + init: function(a,c) { + // Make sure that a selection was provided + a = a || document; + + // Handle HTML strings + if ( typeof a == "string" ) { + var m = quickExpr.exec(a); + if ( m && (m[1] || !c) ) { + // HANDLE: $(html) -> $(array) + if ( m[1] ) + a = jQuery.clean( [ m[1] ], c ); + + // HANDLE: $("#id") + else { + var tmp = document.getElementById( m[3] ); + if ( tmp ) + // Handle the case where IE and Opera return items + // by name instead of ID + if ( tmp.id != m[3] ) + return jQuery().find( a ); + else { + this[0] = tmp; + this.length = 1; + return this; + } + else + a = []; + } -/** - * 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. - * 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 - */ + // HANDLE: $(expr) + } else + return new jQuery( c ).find( a ); -/** - * 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). - * - * @name $ - * @param jQuery obj The jQuery object to be cloned. - * @cat Core - * @type jQuery - */ + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction(a) ) + return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a ); -jQuery.fn = jQuery.prototype = { - /** - * The current version of jQuery. - * - * @private - * @property - * @name jquery - * @type String - * @cat Core - */ + return this.setArray( + // HANDLE: $(array) + a.constructor == Array && 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 ) || + + // HANDLE: $(*) + [ a ] ); + }, + jquery: "@VERSION", - /** - * The number of elements currently matched. - * - * @example $("img").length; - * @before - * @result 2 - * - * @property - * @name length - * @type Number - * @cat Core - */ - - /** - * The number of elements currently matched. - * - * @example $("img").size(); - * @before - * @result 2 - * - * @name size - * @type Number - * @cat Core - */ size: function() { return this.length; }, length: 0, - /** - * Access all matched 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). - * - * @example $("img").get(); - * @before - * @result [ ] - * @desc Selects all images in the document and returns the DOM Elements as an Array - * - * @name get - * @type Array - * @cat Core - */ - - /** - * Access a single matched element. num is used to access the - * Nth element matched. - * - * @example $("img").get(0); - * @before - * @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 ? @@ -256,96 +99,22 @@ jQuery.fn = jQuery.prototype = { this[num]; }, - /** - * Set the jQuery object to an array of elements, while maintaining - * the stack. - * - * @example $("img").set([ document.body ]); - * @result $("img").set() == [ document.body ] - * - * @private - * @name set - * @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 - * 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 ); + Array.prototype.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. - * - * Additionally, the function, when executed, is passed a single - * argument representing the position of the element in the matched - * set. - * - * @example $("img").each(function(i){ - * this.src = "test" + i + ".jpg"; - * }); - * @before - * @result - * @desc Iterates over two images and sets their src property - * - * @name each - * @type jQuery - * @param Function fn A function to execute - * @cat Core - */ each: function( fn, args ) { return jQuery.each( this, fn, args ); }, - /** - * Searches every matched element for the object and returns - * the index of the element, if found, starting with zero. - * Returns -1 if the object wasn't found. - * - * @example $("*").index( $('#foobar')[0] ) - * @before
- * @result 0 - * @desc Returns the index for the element with ID foobar - * - * @example $("*").index( $('#foo')) - * @before
- * @result 2 - * @desc Returns the index for the element with ID foo - * - * @example $("*").index( $('#bar')) - * @before
- * @result -1 - * @desc Returns -1, as there is no element with ID bar - * - * @name index - * @type Number - * @param Element subject Object to search for - * @cat Core - */ index: function( obj ) { var pos = -1; this.each(function(i){ @@ -354,904 +123,409 @@ jQuery.fn = jQuery.prototype = { return pos; }, - /** - * Access a property on the first matched element. - * This method makes it easy to retrieve a property value - * from the first matched element. - * - * @example $("img").attr("src"); - * @before - * @result test.jpg - * @desc Returns the src attribute from the first image in the document. - * - * @name attr - * @type Object - * @param String name The name of the property to access. - * @cat DOM/Attributes - */ - - /** - * 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 - * @desc Sets src and alt attributes to all images. - * - * @name attr - * @type jQuery - * @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. - * - * 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. - * - * @example $("img").attr("src","test.jpg"); - * @before - * @result - * @desc Sets src attribute to all images. - * - * @example $("img").attr("title", "${this.src}"); - * @before - * @result - * @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/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 - * @result - * @desc Sets title attribute from src 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. - * @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 jQuery[ type || "attr" ]( this[0], key ); + 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 this.each(function(){ + return this.each(function(index){ // Set all the styles for ( var prop in obj ) jQuery.attr( type ? this.style : this, - prop, jQuery.prop(this, prop, obj[prop], type) + prop, jQuery.prop(this, obj[prop], type, index, prop) ); }); }, - /** - * Access a style property on the first matched element. - * This method makes it easy to retrieve a style property value - * from the first matched element. - * - * @example $("p").css("color"); - * @before

Test Paragraph.

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

Test Paragraph.

- * @result "bold" - * @desc Retrieves the font-weight style of the first paragraph. - * - * @name css - * @type String - * @param String name The name of the property to access. - * @cat CSS - */ - - /** - * 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. - * - * @name css - * @type jQuery - * @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. - * - * @example $("p").css("color","red"); - * @before

Test Paragraph.

- * @result

Test Paragraph.

- * @desc Changes the color of all paragraphs to red - * - * @name css - * @type jQuery - * @param String key The name of the property to set. - * @param Object value The value to set the property to. - * @cat CSS - */ css: function( key, value ) { return this.attr( key, value, "curCSS" ); }, - /** - * 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

<b>Some</b> new text.

- * @desc Sets the text of all paragraphs. - * - * @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 - * @param String val The text value to set the contents of the element to. - * @cat DOM/Attributes - */ text: function(e) { - var type = this.length && this[0].innerText == undefined ? - "textContent" : "innerText"; - - return e == undefined ? - this.length && this[0][ type ] : - this.each(function(){ this[ type ] = e; }); + if ( typeof e != "object" && e != null ) + return this.empty().append( document.createTextNode( e ) ); + + var t = ""; + 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; + }, + + wrapAll: function(html) { + if ( this[0] ) + // The elements to wrap the target around + jQuery(html, this[0].ownerDocument) + .clone() + .insertBefore(this[0]) + .map(function(){ + var elem = this; + while ( elem.firstChild ) + elem = elem.firstChild; + return elem; + }) + .append(this); + + return this; }, - /** - * Wrap all matched elements with a structure of other elements. - * This wrapping process is most useful for injecting additional - * stucture into a document, without ruining the original semantic - * qualities of a document. - * - * This works by going through the first element - * provided (which is generated, on the fly, from the provided HTML) - * and finds the deepest ancestor element within its - * structure - it is that element that will en-wrap everything else. - * - * This does not work with elements that contain text. Any necessary text - * must be added after the wrapping is done. - * - * @example $("p").wrap("
"); - * @before

Test Paragraph.

- * @result

Test Paragraph.

- * - * @name wrap - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and wrapped around the target. - * @cat DOM/Manipulation - */ - - /** - * Wrap all matched elements with a structure of other elements. - * This wrapping process is most useful for injecting additional - * stucture into a document, without ruining the original semantic - * qualities of a document. - * - * This works by going through the first element - * provided and finding the deepest ancestor element within its - * structure - it is that element that will en-wrap everything else. - * - * This does not work with elements that contain text. Any necessary text - * must be added after the wrapping is done. - * - * @example $("p").wrap( document.getElementById('content') ); - * @before

Test Paragraph.

- * @result

Test Paragraph.

- * - * @name wrap - * @type jQuery - * @param Element elem A DOM element that will be wrapped around the target. - * @cat DOM/Manipulation - */ - wrap: function() { - // The elements to wrap the target around - var a = jQuery.clean(arguments); - - // Wrap each of the matched elements individually + wrapInner: function(html) { return this.each(function(){ - // Clone the structure that we're using to wrap - var b = a[0].cloneNode(true); - - // Insert it before the element to be wrapped - this.parentNode.insertBefore( b, this ); - - // Find the deepest point in the wrap structure - while ( b.firstChild ) - b = b.firstChild; + jQuery(this).contents().wrapAll(html); + }); + }, - // Move the matched element to within the wrap structure - b.appendChild( this ); + wrap: function(html) { + return this.each(function(){ + jQuery(this).wrapAll(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

- * @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

- * @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

- * @desc Appends a jQuery object (similar to an Array of DOM Elements) to all paragraphs. - * - * @name append - * @type jQuery - * @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){ this.appendChild( a ); }); }, - /** - * 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:

- * @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:

- * @desc Prepends an Element to all paragraphs. - * - * @example $("p").prepend( $("b") ); - * @before

I would like to say:

Hello - * @result

HelloI would like to say:

- * @desc Prepends a jQuery object (similar to an Array of DOM Elements) to all paragraphs. - * - * @name prepend - * @type jQuery - * @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 content before each of the matched elements. - * - * @example $("p").before("Hello"); - * @before

I would like to say:

- * @result Hello

I would like to say:

- * @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:

- * @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:

- * @desc Inserts a jQuery object (similar to an Array of DOM Elements) before all paragraphs. - * - * @name before - * @type jQuery - * @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){ this.parentNode.insertBefore( a, this ); }); }, - /** - * 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 - * @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 - * @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 - * @desc Inserts a jQuery object (similar to an Array of DOM Elements) after all paragraphs. - * - * @name after - * @type jQuery - * @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){ this.parentNode.insertBefore( a, this.nextSibling ); }); }, - /** - * 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. - * - * If there was no destructive operation before, an empty set is returned. - * - * @example $("p").find("span").end(); - * @before

Hello, how are you?

- * @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.prevObject || jQuery([]); }, - /** - * Searches for all elements that match the specified expression. - - * 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 - * written using CSS 1-3 Selector syntax, or basic XPath. - * - * @example $("p").find("span"); - * @before

Hello, how are you?

- * @result [ Hello ] - * @desc Starts with all paragraphs and searches for descendant span - * elements, same as $("p span") - * - * @name find - * @type jQuery - * @param String expr An expression to search with. - * @cat DOM/Traversing - */ find: function(t) { - return this.set( jQuery.map( this, function(a){ - return jQuery.find(t,a); - }) ); - }, + var data = jQuery.map(this, function(a){ return jQuery.find(t,a); }); + return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ? + jQuery.unique( data ) : data ); + }, + + clone: function() { + var $this = this.add(this.find("*")); + if (jQuery.browser.msie) { + // Need to remove events on the element and its descendants + $this.each(function() { + this._$events = {}; + for (var type in this.$events) + this._$events[type] = jQuery.extend({},this.$events[type]); + }).unbind(); + } - /** - * 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?

- * @desc Clones all b elements (and selects the clones) and prepends them to all paragraphs. - * - * @name clone - * @type jQuery - * @cat DOM/Manipulation - */ - clone: function(deep) { - return this.set( jQuery.map( this, function(a){ - return a.cloneNode( deep != undefined ? deep : true ); + // Do the clone + var r = this.pushStack( jQuery.map( this, function(a){ + return a.cloneNode( true ); }) ); + + if (jQuery.browser.msie) { + $this.each(function() { + // Add the events back to the original and its descendants + var events = this._$events; + for (var type in events) + for (var handler in events[type]) + jQuery.event.add(this, type, events[type][handler], events[type][handler].data); + this._$events = null; + }); + } + + // copy form values over + var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]'); + $this.filter('select,input[@type=checkbox]').each(function(i) { + if (this.selectedIndex) + inputs[i].selectedIndex = this.selectedIndex; + if (this.checked) + inputs[i].checked = true; + }); + + // Return the cloned set + return r; }, - /** - * Removes all elements from the set of matched elements that do not - * 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. - * - * @example $("p").filter(".selected") - * @before

Hello

How are you?

- * @result [

Hello

] - * @desc Selects all paragraphs and removes those without a class "selected". - * - * @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|Array expression Expression(s) to search with. - * @cat DOM/Traversing - */ - - /** - * Removes all elements from the set of matched elements that do not - * pass the specified filter. This method is used to narrow down - * the results of a search. - * - * @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 Function filter A function to use for filtering - * @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) ); }, - /** - * 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( $("#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 - * @param Element el An element to remove from the set - * @cat DOM/Traversing - */ - - /** - * Removes elements matching the specified expression from the set - * of matched elements. This method is used to remove one or more - * elements from a jQuery object. - * - * @example $("p").not("#selected") - * @before

Hello

Hello Again

- * @result [

Hello

] - * @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 - */ 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. - * - * @example $("p").add("span") - * @before

Hello

Hello Again

- * @result [

Hello

, Hello Again ] - * - * @name add - * @type jQuery - * @param String expr An expression whose matched elements are added - * @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

Hello

Hello Again

- * @result [

Hello

, Hello Again ] - * - * @example $("p").add([document.getElementById("a"), document.getElementById("b")]) - * @before

Hello

Hello AgainAnd Again

- * @result [

Hello

, Hello Again, And Again ] - * - * @name add - * @type jQuery - * @param Element|Array elements One or more Elements to add - * @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] ) + ); }, - /** - * Checks the current selection against an expression and returns true, - * if at least one element of the selection fits the given expression. - * - * Does return false, if no element fits or the expression is not valid. - * - * filter(String) is used internally, therefore all rules that apply there - * apply here, too. - * - * @example $("input[@type='checkbox']").parent().is("form") - * @before
- * @result true - * @desc Returns true, because the parent of the input is a form element - * - * @example $("input[@type='checkbox']").parent().is("form") - * @before

- * @result false - * @desc Returns false, because the parent of the input is a p element - * - * @name is - * @type Boolean - * @param String expr The expression with which to filter - * @cat DOM/Traversing - */ is: function(expr) { - return expr ? jQuery.filter(expr,this).r.length > 0 : false; + return expr ? jQuery.multiFilter(expr,this).length > 0 : false; }, - /** - * Get the current value of the first matched element. - * - * @example $("input").val(); - * @before - * @result "some text" - * - * @name val - * @type String - * @cat DOM/Attributes - */ - - /** - * Set the value of every matched element. - * - * @example $("input").val("test"); - * @before - * @result - * - * @name val - * @type jQuery - * @param String val Set the property to the specified value. - * @cat DOM/Attributes - */ val: function( val ) { - return val == undefined ? ( this.length ? this[0].value : null ) : this.attr( "value", val ); + if ( val == undefined ) { + if ( this.length ) { + var elem = this[0]; + + // We need to handle select boxes special if ( jQuery.nodeName(elem, "select") ) { var index = elem.selectedIndex, + a = [], + options = elem.options, + one = elem.type == "select-one"; + + // Nothing was selected if ( index < 0 ) + return null; + + // Loop through all the selected options for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[i]; if ( option.selected ) { // Get the specifc value for the option var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value; + + // We don't need an array for one selects if ( one ) + return val; + + // Multi-Selects return an array a.push(val); } } + return a; + + // Everything else, we just grab the value } else + return this[0].value.replace(/\r/g, ""); + } + } else + return this.attr( "value", val ); }, - /** - * Get the html contents of the first matched element. - * This property is not available on XML documents. - * - * @example $("div").html(); - * @before
- * @result - * - * @name html - * @type String - * @cat DOM/Attributes - */ - - /** - * Set the html contents of every matched element. - * This property is not available on XML documents. - * - * @example $("div").html("new stuff"); - * @before
- * @result
new stuff
- * - * @name html - * @type jQuery - * @param String val Set the html contents to the specified value. - * @cat DOM/Attributes - */ html: function( val ) { - return val == undefined ? ( this.length ? this[0].innerHTML : null ) : this.empty().append( val ); + return val == undefined ? + ( this.length ? this[0].innerHTML : null ) : + this.empty().append( val ); + }, + + replaceWith: function( val ) { + return this.after( val ).remove(); + }, + + slice: function() { + return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); + }, + + map: function(fn) { + return this.pushStack(jQuery.map( this, function(elem,i){ + return fn.call( elem, i, elem ); + })); + }, + + andSelf: function() { + return this.add( this.prevObject ); }, - /** - * @private - * @name domManip - * @param Array args - * @param Boolean table Insert TBODY in TABLEs if one is not found. - * @param Number dir If dir<0, process args in reverse order. - * @param Function fn The function doing the DOM manipulation. - * @type jQuery - * @cat Core - */ - domManip: function(args, table, dir, fn){ - var clone = this.length > 1; - var a = jQuery.clean(args); - if ( dir < 0 ) - a.reverse(); + domManip: function(args, table, dir, fn) { + var clone = this.length > 1, a; return this.each(function(){ + if ( !a ) { + a = jQuery.clean(args, this.ownerDocument); + if ( dir < 0 ) + a.reverse(); + } + 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(){ + if ( jQuery.nodeName(this, "script") ) { + if ( this.src ) + jQuery.ajax({ url: this.src, async: false, dataType: "script" }); + else + jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" ); + } else + fn.apply( obj, [ clone ? this.cloneNode(true) : this ] ); + }); }); } }; -/** - * Extends the jQuery object itself. Can be used to add functions into - * the jQuery namespace and to add plugin methods (plugins). - * - * @example jQuery.fn.extend({ - * check: function() { - * return this.each(function() { this.checked = true; }); - * }, - * uncheck: function() { - * return this.each(function() { this.checked = false; }); - * } - * }); - * $("input[@type=checkbox]").check(); - * $("input[@type=radio]").uncheck(); - * @desc Adds two plugin methods. - * - * @example jQuery.extend({ - * min: function(a, b) { return a < b ? a : b; }, - * max: function(a, b) { return a > b ? a : b; } - * }); - * @desc Adds two functions into the jQuery namespace - * - * @name $.extend - * @param Object prop The object that will be merged into the jQuery object - * @type Object - * @cat Core - */ - -/** - * Extend one object with one or more others, returning the original, - * modified, object. This is a great utility for simple inheritance. - * - * @example var settings = { validate: false, limit: 5, name: "foo" }; - * var options = { validate: true, name: "bar" }; - * jQuery.extend(settings, options); - * @result settings == { validate: true, limit: 5, name: "bar" } - * @desc Merge settings and options, modifying settings - * - * @example var defaults = { validate: false, limit: 5, name: "foo" }; - * var options = { validate: true, name: "bar" }; - * var settings = jQuery.extend({}, defaults, options); - * @result settings == { validate: true, limit: 5, name: "bar" } - * @desc Merge defaults and options, without modifying the defaults - * - * @name $.extend - * @param Object target The object to extend - * @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 - */ jQuery.extend = jQuery.fn.extend = function() { // copy reference to target object - var target = arguments[0], - a = 1; + var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false; + + // Handle a deep copy situation + if ( target.constructor == Boolean ) { + deep = target; + target = arguments[1] || {}; + } // extend jQuery itself if only one argument is passed - if ( arguments.length == 1 ) { + if ( al == 1 ) { target = this; a = 0; } + var prop; - while (prop = arguments[a++]) - // Extend the base object - for ( var i in prop ) target[i] = prop[i]; + + for ( ; a < al; a++ ) + // Only deal with non-null/undefined values + if ( (prop = arguments[a]) != null ) + // Extend the base object + for ( var i in prop ) { + // Prevent never-ending loop + if ( target == prop[i] ) + continue; + + // Recurse if we're merging object values + if ( deep && typeof prop[i] == 'object' && target[i] ) + jQuery.extend( target[i], prop[i] ); + + // Don't bring in undefined values + else if ( prop[i] != undefined ) + target[i] = prop[i]; + } // Return the modified object return target; }; jQuery.extend({ - /** - * Run this function to give control of the $ variable back - * to whichever library first implemented it. This helps to make - * sure that jQuery doesn't conflict with the $ object - * of other libraries. - * - * By using this function, you will only be able to access jQuery - * using the 'jQuery' variable. For example, where you used to do - * $("div p"), you now must do jQuery("div p"). - * - * @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 jQuery.noConflict(); - * (function($) { - * $(function() { - * // more code using $ as alias to jQuery - * }); - * })(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 - * @type undefined - * @cat Core - */ - noConflict: function() { - if ( jQuery._$ ) - $ = jQuery._$; + noConflict: function(deep) { + window.$ = _$; + if ( deep ) + window.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" && !fn.nodeName && + fn.constructor != Array && /function/i.test( fn + "" ); + }, + + // check if an element is in a XML document + isXMLDoc: function(elem) { + return elem.documentElement && !elem.body || + elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; + }, + + // Evalulates a script in a global context + // Evaluates Async. in Safari 2 :-( + globalEval: function( data ) { + data = jQuery.trim( data ); + if ( data ) { + if ( window.execScript ) + window.execScript( data ); + else if ( jQuery.browser.safari ) + // safari doesn't provide a synchronous global eval + window.setTimeout( data, 0 ); + else + eval.call( window, data ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); }, - /** - * A generic iterator function, which can be used to seemlessly - * iterate over both objects and arrays. This function is not the same - * as $().each() - which is used to iterate, exclusively, over a jQuery - * object. This function can be used to iterate over anything. - * - * 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 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, n){ - * alert( "Name: " + i + ", Value: " + n ); - * }); - * - * @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 - */ // args is for internal usage only each: function( obj, fn, args ) { - if ( obj.length == undefined ) - for ( var i in obj ) - fn.apply( obj[i], args || [i, obj[i]] ); - else - for ( var i = 0, ol = obj.length; i < ol; i++ ) - if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break; + if ( args ) { + if ( obj.length == undefined ) + for ( var i in obj ) + fn.apply( obj[i], args ); + else + for ( var i = 0, ol = obj.length; i < ol; i++ ) + if ( fn.apply( obj[i], args ) === false ) break; + + // A special, fast, case for the most common use of each + } else { + if ( obj.length == undefined ) + for ( var i in obj ) + fn.call( obj[i], i, obj[i] ); + else + for ( var i = 0, ol = obj.length, val = obj[0]; + i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){} + } + return obj; }, - prop: function(elem, key, value){ - // Handle executable functions - return value.constructor == Function && - value.call( elem ) || value; + prop: function(elem, value, type, index, prop){ + // Handle executable functions + if ( jQuery.isFunction( value ) ) + value = 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){ + 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 != undefined ? + jQuery.grep( elem.className.split(/\s+/), function(cur){ + return !jQuery.className.has( c, cur ); + }).join(" ") : ""; }, + // internal only, use is(".class") has: function( t, c ) { - t = t.className || t; - return t && new RegExp("(^|\\s)" + c + "(\\s|$)").test( t ); + return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1; } }, - /** - * Swap in/out style options. - * @private - */ swap: function(e,o,f) { for ( var i in o ) { e.style["old"+i] = e.style[i]; @@ -1266,13 +540,13 @@ 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") { + if ( jQuery(e).is(':visible') ) { oHeight = e.offsetHeight; oWidth = e.offsetWidth; } else { @@ -1282,14 +556,14 @@ jQuery.extend({ visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0" }).appendTo(e.parentNode)[0]; - var parPos = jQuery.css(e.parentNode,"position"); - if ( parPos == "" || parPos == "static" ) + var parPos = jQuery.css(e.parentNode,"position") || "static"; + if ( parPos == "static" ) e.parentNode.style.position = "relative"; oHeight = e.clientHeight; oWidth = e.clientWidth; - if ( parPos == "" || parPos == "static" ) + if ( parPos == "static" ) e.parentNode.style.position = "static"; e.parentNode.removeChild(e); @@ -1303,78 +577,145 @@ jQuery.extend({ }, curCSS: function(elem, prop, force) { - var ret; + var ret, stack = [], swap = []; + + // A helper method for determining if an element's values are broken + function color(a){ + if ( !jQuery.browser.safari ) + return false; + + var ret = document.defaultView.getComputedStyle(a,null); + return !ret || ret.getPropertyValue("color") == ""; + } + + if (prop == "opacity" && jQuery.browser.msie) { + ret = jQuery.attr(elem.style, "opacity"); + return ret == "" ? "1" : ret; + } - if (prop == 'opacity' && jQuery.browser.msie) - return jQuery.attr(elem.style, 'opacity'); - - if (prop == "float" || prop == "cssFloat") - prop = jQuery.browser.msie ? "styleFloat" : "cssFloat"; + if (prop.match(/float/i)) + prop = styleFloat; if (!force && elem.style[prop]) ret = elem.style[prop]; else if (document.defaultView && document.defaultView.getComputedStyle) { - if (prop == "cssFloat" || prop == "styleFloat") + if (prop.match(/float/i)) prop = "float"; prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase(); var cur = document.defaultView.getComputedStyle(elem, null); - if ( cur ) + if ( cur && !color(elem) ) ret = cur.getPropertyValue(prop); - else if ( prop == 'display' ) - ret = 'none'; - else - jQuery.swap(elem, { display: 'block' }, function() { - var c = document.defaultView.getComputedStyle(this, ''); - ret = c && c.getPropertyValue(prop) || ''; - }); - } else if (elem.currentStyle) { + // If the element isn't reporting its values properly in Safari + // then some display: none elements are involved + else { + // Locate all of the parent display: none elements + for ( var a = elem; a && color(a); a = a.parentNode ) + stack.unshift(a); + + // Go through and make them visible, but in reverse + // (It would be better if we knew the exact display type that they had) + for ( a = 0; a < stack.length; a++ ) + if ( color(stack[a]) ) { + swap[a] = stack[a].style.display; + stack[a].style.display = "block"; + } + + // Since we flip the display style, we have to handle that + // one special, otherwise get the value + ret = prop == "display" && swap[stack.length-1] != null ? + "none" : + document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || ""; + + // Finally, revert the display styles back + for ( a = 0; a < swap.length; a++ ) + if ( swap[a] != null ) + stack[a].style.display = swap[a]; + } + + if ( prop == "opacity" && ret == "" ) + ret = "1"; + } else if (elem.currentStyle) { var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();}); ret = elem.currentStyle[prop] || elem.currentStyle[newProp]; - + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) { + var style = elem.style.left; + var runtimeStyle = elem.runtimeStyle.left; + elem.runtimeStyle.left = elem.currentStyle.left; + elem.style.left = ret || 0; + ret = elem.style.pixelLeft + "px"; + elem.style.left = style; + elem.runtimeStyle.left = runtimeStyle; + } } return ret; }, - clean: function(a) { + clean: function(a, doc) { var r = []; - - for ( var i = 0, al = a.length; i < al; i++ ) { - var arg = a[i]; + doc = doc || document; + + jQuery.each( a, function(i,arg){ + if ( !arg ) return; + + if ( arg.constructor == Number ) + arg = arg.toString(); - // Convert html string into DOM nodes + // Convert html string into DOM nodes if ( typeof arg == "string" ) { + // Fix "XHTML"-style tags in all browsers + arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){ + return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+">"; + }); + // Trim whitespace, otherwise indexOf won't work as expected - var s = jQuery.trim(arg), div = document.createElement("div"), tb = []; + var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = []; var wrap = - // option or optgroup - !s.indexOf("", ""] || + // option or optgroup + !s.indexOf("", ""] || - !s.indexOf("", ""] || + + s.match(/^<(thead|tbody|tfoot|colg|cap)/) && [1, "", "
"] || !s.indexOf("", ""] || // matched above - !s.indexOf("", ""] || + !s.indexOf("", ""] || + + // IE can't serialize and