Test Paragraph.
X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=537b4e2bec7a6b250e435ad4cf97ac827d45c3a6;hb=902554a38da6c9e2d0c115bc189634d56f9b4d34;hp=b7715be353ab57e0bdda6c71ab3e8d7b5059a33a;hpb=94b0bf5f2b7a4003196a679649567a13d0f13ad0;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index b7715be..537b4e2 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. * @@ -9,360 +9,112 @@ * $Rev$ */ -// Global undefined variable -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 - * @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); +// Map over jQuery in case of overwrite +if ( typeof jQuery != "undefined" ) + var _jQuery = jQuery; +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); - - // 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 ) ); - - // See if an extra function was provided - var fn = arguments[ arguments.length - 1 ]; - - // If so, execute it in context - if ( fn && fn.constructor == Function ) - this.each(fn); + + return this.init(a,c); }; // Map over the $ in case of overwrite if ( typeof $ != "undefined" ) - 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. - * - * 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. - * - * By default, $() looks for DOM elements within the context of the - * current HTML document. - * - * @example $("div > p") - * @desc This finds all p elements that are children of a div element. - * @before
one
two
three
- * @result [two
] - * - * @example $("Hello
one
two
three
- * @result [two
] - * - * @example $(document.body).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 - */ +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 = []; + } -/** - * Wrap jQuery functionality around a set of DOM Elements. - * - * @example $( myForm.elements ).hide() - * @desc Hides all the input elements within a form - * - * @name $ - * @param ArrayTest Paragraph.
- * @result red - * @desc Retrieves the color style of the first paragraph - * - * @example $("p").css("fontWeight"); - * @beforeTest Paragraph.
- * @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 - * @param String name The name of the property to access. - * @cat CSS - */ - - /** - * Set a hash of key/value 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" }); - * @beforeTest Paragraph.
- * @resultTest Paragraph.
- * - * @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. - * @cat CSS - */ - - /** - * Set a single style property to a value, on all matched elements. - * - * @example $("p").css("color","red"); - * @beforeTest Paragraph.
- * @resultTest 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'); - * - * @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" ); }, - /** - * Retrieve 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(); - * @beforeTest Paragraph.
- * @result Test Paragraph. - * - * @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.' ); - * - * @name text - * @type String - * @cat DOM - */ text: function(e) { - e = e || this; + if ( typeof e != "object" && e != null ) + 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; }, - /** - * 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(""); - * @beforeTest Paragraph.
- * @resultTest Paragraph.
Test Paragraph.
- * @resultTest Paragraph.
I would like to say:
- * @resultI 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. - * - * @example $("p").append( $("#foo")[0] ); - * @beforeI would like to say:
Hello - * @resultI 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. - * - * @example $("p").append( $("b") ); - * @beforeI would like to say:
Hello - * @resultI 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" ); - * - * @name append - * @type jQuery - * @param ArrayI would like to say:
- * @resultHelloI 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. - * - * @example $("p").prepend( $("#foo")[0] ); - * @beforeI would like to say:
Hello - * @resultHelloI 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. - * - * @example $("p").prepend( $("b") ); - * @beforeI would like to say:
Hello - * @resultHelloI 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" ); - * - * @name prepend - * @type jQuery - * @param ArrayI would like to say:
- * @result HelloI 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. - * - * @example $("p").before( $("#foo")[0] ); - * @beforeI would like to say:
Hello - * @result HelloI 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. - * - * @example $("p").before( $("b") ); - * @beforeI would like to say:
Hello - * @result HelloI 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" ); - * - * @name before - * @type jQuery - * @param ArrayI would like to say:
- * @resultI 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. - * - * @example $("p").after( $("#foo")[0] ); - * @before HelloI would like to say:
- * @resultI 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. - * - * @example $("p").after( $("b") ); - * @before HelloI would like to say:
- * @resultI 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" ); - * - * @name after - * @type jQuery - * @param ArrayHello, how are you?
- * @result $("p").find("span").end() == [...
] - * - * @test ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' ); - * - * @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 - * 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"); - * @beforeHello, how are you?
- * @result $("p").find("span") == [ Hello ] - * - * @test ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' ); - * - * @name find - * @type jQuery - * @param String expr An expression to search with. - * @cat DOM/Traversing - */ find: function(t) { - return this.pushStack( jQuery.map( this, function(a){ - return jQuery.find(t,a); - }), arguments ); - }, + 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(); + } - /** - * 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. - * 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 HelloHello, 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' ); - * - * @name clone - * @type jQuery - * @cat DOM/Manipulation - */ - clone: function(deep) { - return this.pushStack( jQuery.map( this, function(a){ - return a.cloneNode( deep != undefined ? deep : true ); - }), arguments ); + // 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. 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. - * - * @example $("p").filter(".selected") - * @beforeHello
How are you?
- * @result $("p").filter(".selected") == [Hello
] - * - * @test isSet( $("input").filter(":checked").get(), q("radio2", "check1"), "Filter elements" ); - * - * @name filter - * @type jQuery - * @param String expr An expression 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. - * - * @example $("p").filter([".selected", ":first"]) - * @beforeHello
Hello Again
And Again
- * @result $("p").filter([".selected", ":first"]) == [Hello
,And Again
] - * - * @name filter - * @type jQuery - * @param ArrayHello
Hello Again
- * @result [Hello
] - * - * @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") - * @beforeHello
Hello Again
- * @result [Hello
] - * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not") - * - * @name not - * @type jQuery - * @param String expr An expression with which to remove matching 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. - * - * @example $("p").add("span") - * @beforeHello
Hello Again
- * @result [Hello
, Hello Again ] - * - * @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. - * - * @example $("p").add([document.getElementById("a"), document.getElementById("b")]) - * @beforeHello
Hello AgainAnd Again
- * @result [Hello
, Hello Again, And Again ] - * - * @name add - * @type jQuery - * @param ArrayHello
Hello Again
- * @result [Hello
, Hello Again ] - * - * @name add - * @type jQuery - * @param Element el An Element to add - * @cat DOM/Traversing - */ add: function(t) { - return this.pushStack( jQuery.merge( this, t.constructor == String ? - jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments ); + 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 the selection fits the given expression. Does return false, if the - * selection does not fit or the expression is not valid. - * - * @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 - * - * @example $("form").is(null) - * @before - * @result false - * @desc An invalid expression always returns false. - * - * @test ok( $('#form').is('form'), 'Check for element: A form must be a form' ); - * @test ok( !$('#form').is('div'), 'Check for element: A form is not a div' ); - * @test ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' ); - * @test ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' ); - * @test ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' ); - * @test ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' ); - * @test ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' ); - * @test ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' ); - * @test ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' ); - * @test ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' ); - * @test ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' ); - * @test ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' ); - * @test ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' ); - * @test ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' ); - * @test ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' ); - * @test ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' ); - * @test ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' ); - * @test ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' ); - * @test ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' ); - * @test ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' ); - * @test ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' ); - * @test ok( !$('#foo').is(undefined), 'Expected false for an invalid expression - undefined' ); - * - * @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; + }, + + val: function( 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 ); + }, + + html: function( 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 ); + })); }, - /** - * - * - * @private - * @name domManip - * @param Array args - * @param Boolean table - * @param Number int - * @param Function fn The function doing the DOM manipulation. - * @type jQuery - * @cat Core - */ - domManip: function(args, table, dir, fn){ - var clone = this.size() > 1; - var a = jQuery.clean(args); + andSelf: function() { + return this.add( this.prevObject ); + }, + + 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() != "THEAD" ) { - var tbody = this.getElementsByTagName("tbody"); + if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") ) + obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody")); - if ( !tbody.length ) { - obj = document.createElement("tbody"); - this.appendChild( obj ); + 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 - obj = tbody[0]; - } - - for ( var i = ( dir < 0 ? a.length - 1 : 0 ); - i != ( dir < 0 ? dir : a.length ); i += dir ) { - fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] ); - } + fn.apply( obj, [ clone ? this.cloneNode(true) : this ] ); + }); }); - }, + } +}; - /** - * - * - * @private - * @name pushStack - * @param Array a - * @param Array args - * @type jQuery - * @cat Core - */ - pushStack: function(a,args) { - var fn = args && args[args.length-1]; - - if ( !fn || fn.constructor != Function ) { - if ( !this.stack ) this.stack = []; - this.stack.push( this.get() ); - this.get( a ); - } else { - var old = this.get(); - this.get( a ); - if ( fn.constructor == Function ) - this.each( fn ); - this.get( old ); - } +jQuery.extend = jQuery.fn.extend = function() { + // copy reference to target object + var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false; - return this; + // Handle a deep copy situation + if ( target.constructor == Boolean ) { + deep = target; + target = arguments[1] || {}; } -}; -/** - * Extends the jQuery object itself. Can be used to add both static - * functions and plugin methods. - * - * @example $.fn.extend({ - * check: function() { - * this.each(function() { this.checked = true; }); - * ), - * uncheck: function() { - * this.each(function() { this.checked = false; }); - * } - * }); - * $("input[@type=checkbox]").check(); - * $("input[@type=radio]").uncheck(); - * @desc Adds two plugin methods. - * - * @private - * @name extend - * @param Object obj - * @type Object - * @cat Core - */ + // extend jQuery itself if only one argument is passed + if ( al == 1 ) { + target = this; + a = 0; + } -/** - * Extend one object with another, 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" } - * - * @test var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }; - * var options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }; - * var optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" }; - * var merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" }; - * jQuery.extend(settings, options); - * isSet( settings, merged, "Check if extended: settings must be extended" ); - * isSet ( options, optionsCopy, "Check if not modified: options must not be modified" ); - * - * @name $.extend - * @param Object obj The object to extend - * @param Object prop The object that will be merged into the first. - * @type Object - * @cat Javascript - */ -jQuery.extend = jQuery.fn.extend = function(obj,prop) { - if ( !prop ) { prop = obj; obj = this; } - for ( var i in prop ) obj[i] = prop[i]; - return obj; -}; + var prop; -jQuery.extend({ - /** - * @private - * @name init - * @type undefined - * @cat Core - */ - init: function(){ - jQuery.initDone = true; - - jQuery.each( jQuery.macros.axis, function(i,n){ - jQuery.fn[ i ] = function(a) { - var ret = jQuery.map(this,n); - if ( a && a.constructor == String ) - ret = jQuery.filter(a,ret).r; - return this.pushStack( ret, arguments ); - }; - }); + 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; - jQuery.each( jQuery.macros.to, function(i,n){ - jQuery.fn[ i ] = function(){ - var a = arguments; - return this.each(function(){ - for ( var j = 0; j < a.length; j++ ) - jQuery(a[j])[n]( this ); - }); - }; - }); + // Recurse if we're merging object values + if ( deep && typeof prop[i] == 'object' && target[i] ) + jQuery.extend( target[i], prop[i] ); - jQuery.each( jQuery.macros.each, function(i,n){ - jQuery.fn[ i ] = function() { - return this.each( n, arguments ); - }; - }); + // Don't bring in undefined values + else if ( prop[i] != undefined ) + target[i] = prop[i]; + } - jQuery.each( jQuery.macros.filter, function(i,n){ - jQuery.fn[ n ] = function(num,fn) { - return this.filter( ":" + n + "(" + num + ")", fn ); - }; - }); + // Return the modified object + return target; +}; - jQuery.each( jQuery.macros.attr, function(i,n){ - n = n || i; - jQuery.fn[ i ] = function(h) { - return h == undefined ? - this.length ? this[0][n] : null : - this.attr( n, h ); - }; - }); +jQuery.extend({ + noConflict: function(deep) { + window.$ = _$; + if ( deep ) + window.jQuery = _jQuery; + return jQuery; + }, - jQuery.each( jQuery.macros.css, function(i,n){ - jQuery.fn[ n ] = function(h) { - return h == undefined ? - ( this.length ? jQuery.css( this[0], n ) : null ) : - this.css( n, h ); - }; - }); + // 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. - * - * @example $.each( [0,1,2], function(i){ - * alert( "Item #" + i + ": " + this ); - * }); - * @desc This is an example of iterating over the items in an array, accessing both the current item and its index. - * - * @example $.each( { name: "John", lang: "JS" }, function(i){ - * alert( "Name: " + i + ", Value: " + this ); - * }); - * @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; i < obj.length; i++ ) - fn.apply( obj[i], args || [i, obj[i]] ); + 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, 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: { - add: function(o,c){ - if (jQuery.className.has(o,c)) return; - o.className += ( o.className ? " " : "" ) + c; + // internal only, use addClass("class") + add: function( elem, c ){ + jQuery.each( (c || "").split(/\s+/), function(i, cur){ + if ( !jQuery.className.has( elem.className, cur ) ) + elem.className += ( elem.className ? " " : "" ) + cur; + }); }, - remove: function(o,c){ - /* - o.className = !c ? "" : - o.className.replace( - new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");*/ - if( !c ) { - o.className = ""; - } else { - var classes = o.className.split(" "); - for(var i=0; i