Test Paragraph.
X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=93ebe2009ed94e9353fb3bbf32b2db763e0177cd;hb=ce2555ea7c265d0e08084b469d785d3d719445f6;hp=f7f3997d98de816aa644ec0c32c86ccdb96f4f6b;hpb=2a921daaa7a02a73967e51b9e09037f667af5af7;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index f7f3997..93ebe20 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1,8 +1,8 @@ /* - * jQuery - New Wave Javascript + * jQuery @VERSION - New Wave Javascript * * Copyright (c) 2006 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) + * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. * * $Date$ @@ -16,22 +16,22 @@ 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( $, "$()" ); + * ok( Function.prototype.apply, "Function.apply()" ); + * ok( document.getElementById, "getElementById" ); + * ok( document.getElementsByTagName, "getElementsByTagName" ); + * ok( RegExp, "RegExp" ); + * ok( jQuery, "jQuery" ); + * ok( $, "$()" ); * * @constructor * @private * @name jQuery * @cat Core */ -function jQuery(a,c) { +var jQuery = function(a,c) { // Shortcut for document ready (because $(document).each() is silly) - if ( a && a.constructor == Function && jQuery.fn.ready ) + if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function return jQuery(document).ready(a); // Make sure that a selection was provided @@ -44,49 +44,53 @@ function jQuery(a,c) { // Watch for when a jQuery object is passed at the context if ( c && c.jquery ) return jQuery( c ).find(a); - + // If the context is global, return a new object if ( window == this ) return new jQuery(a,c); // Handle HTML strings - var m = /^[^<]*(<.+>)[^>]*$/.exec(a); - if ( m ) a = jQuery.clean( [ m[1] ] ); + if ( a.constructor == String ) { + 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 ? + this.get( a.constructor == Array || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType ? // Assume that it is an array of DOM Elements jQuery.merge( a, [] ) : // Find the matching elements and save them for later jQuery.find( a, c ) ); - // See if an extra function was provided + // See if an extra function was provided var fn = arguments[ arguments.length - 1 ]; - + // If so, execute it in context - if ( fn && fn.constructor == Function ) + if ( fn && typeof fn == "function" ) this.each(fn); -} + + return this; +}; // Map over the $ in case of overwrite if ( typeof $ != "undefined" ) jQuery._$ = $; - + /** - * This function accepts a string containing a CSS selector, + * 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 + * 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 + * By default, $() looks for DOM elements within the context of the * current HTML document. * * @example $("div > p") @@ -95,14 +99,17 @@ if ( typeof $ != "undefined" ) * @result [
two
] * * @example $("Hello
one
two
three
* @result [two
] * - * @example $(document).ready( loaded ); - * @desc Executes the "loaded" function when the DOM is ready to - * be manipulated. + * @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 */ - + /** * Wrap jQuery functionality around a set of DOM Elements. * @@ -148,26 +154,34 @@ if ( typeof $ != "undefined" ) * @cat Core * @type jQuery */ - + /** * A shorthand for $(document).ready(), allowing you to bind a function - * to be executed when the DOM document has finished loading. + * 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. * - * @example $( loaded ) - * @desc Executes the function "loaded" when the DOM is ready to be used. + * @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 duplicate copy of a jQuery object. + * 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'. + * $( 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. @@ -180,7 +194,7 @@ var $ = jQuery; jQuery.fn = jQuery.prototype = { /** - * The current SVN version of jQuery. + * The current version of jQuery. * * @private * @property @@ -188,8 +202,8 @@ jQuery.fn = jQuery.prototype = { * @type String * @cat Core */ - jquery: "$Rev$", - + jquery: "@VERSION", + /** * The number of elements currently matched. * @@ -197,14 +211,14 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" ); + * @test ok( $("div").length == 2, "Get Number of Elements Found" ); * * @property * @name length * @type Number * @cat Core */ - + /** * The number of elements currently matched. * @@ -212,7 +226,7 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" ); + * @test ok( $("div").size() == 2, "Get Number of Elements Found" ); * * @name size * @type Number @@ -221,7 +235,7 @@ jQuery.fn = jQuery.prototype = { size: function() { return this.length; }, - + /** * Access all matched elements. This serves as a backwards-compatible * way of accessing all matched elements (other than the jQuery object @@ -237,23 +251,23 @@ jQuery.fn = jQuery.prototype = { * @type 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( $('#main').css("display") == 'none', '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 @@ -439,18 +533,48 @@ jQuery.fn = jQuery.prototype = { * @beforeTest Paragraph.
* @resultTest Paragraph.
* + * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); + * $('#foo').css({display: 'none'}); + * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); + * $('#foo').css({display: 'block'}); + * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); + * $('#floatTest').css({styleFloat: 'right'}); + * ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right'); + * $('#floatTest').css({cssFloat: 'left'}); + * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left'); + * $('#floatTest').css({'float': 'right'}); + * ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right'); + * $('#floatTest').css({'font-size': '30px'}); + * ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px'); + * * @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'); + * $('#foo').css('display', 'none'); + * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); + * $('#foo').css('display', 'block'); + * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); + * $('#floatTest').css('styleFloat', 'left'); + * ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left'); + * $('#floatTest').css('cssFloat', 'right'); + * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right'); + * $('#floatTest').css('float', 'left'); + * ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left'); + * $('#floatTest').css('font-size', '20px'); + * ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px'); * * @name css * @type jQuery @@ -461,9 +585,9 @@ jQuery.fn = jQuery.prototype = { css: function( key, value ) { return this.attr( key, value, "curCSS" ); }, - + /** - * Retreive the text contents of all matched elements. The result is + * 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. * @@ -471,6 +595,9 @@ jQuery.fn = jQuery.prototype = { * @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 @@ -487,41 +614,57 @@ jQuery.fn = jQuery.prototype = { } 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 + * 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 + * 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.
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' ); + * ok( $('#select3').append('').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element'); + * * @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 + * 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 + * 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' ); + * ok( $('#select3').prepend('').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element'); + * * @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 */ - + /** - * Append an element to the inside of all matched elements. - * This operation is the best way to insert an element inside, at the + * 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 */ - + /** - * Append 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 + * 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' ); + * ok( $('#yahoo').end(), 'Check for end with nothing to end' ); + * * @name end * @type jQuery * @cat DOM/Traversing */ end: function() { + if( !(this.stack && this.stack.length) ) + return this; return this.get( this.stack.pop() ); }, - + /** * 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 + * 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. @@ -792,6 +992,11 @@ jQuery.fn = jQuery.prototype = { * @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 @@ -801,19 +1006,27 @@ jQuery.fn = jQuery.prototype = { return a.cloneNode( deep != undefined ? deep : true ); }), arguments ); }, - + /** - * Removes all elements from the set of matched elements that do not + * 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" ); + * @test $("input").filter(":checked",function(i){ + * ok( this == q("radio2", "check1")[i], "Filter elements, context" ); + * }); + * @test $("#main > p#ap > a").filter("#foobar",function(){},function(i){ + * ok( this == q("google","groups", "mark")[i], "Filter elements, else context" ); + * }); + * * @name filter * @type jQuery * @param String expr An expression to search with. @@ -822,8 +1035,8 @@ jQuery.fn = jQuery.prototype = { /** * 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 + * 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 @@ -845,17 +1058,18 @@ jQuery.fn = jQuery.prototype = { for ( var i = 0; i < t.length; i++ ) if ( jQuery.filter(t[i],[a]).r.length ) return a; + return false; }) || t.constructor == Boolean && ( t ? this.get() : [] ) || - t.constructor == Function && + typeof t == "function" && jQuery.grep( this, t ) || jQuery.filter(t,this).r, arguments ); }, - + /** * Removes the specified Element from the set of matched elements. This * method is used to remove a single Element from a jQuery object. @@ -874,11 +1088,12 @@ jQuery.fn = jQuery.prototype = { * 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 cmpOK($("#main > p#ap > a").not("#google").length, "==", 2, ".not") + * + * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not") * * @name not * @type jQuery @@ -936,23 +1151,61 @@ jQuery.fn = jQuery.prototype = { return this.pushStack( jQuery.merge( this, t.constructor == String ? jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments ); }, - + /** - * A wrapper function for each() to be used by append and prepend. - * Handles cases where you're trying to modify the inner contents of - * a table, when you actually need to work with the tbody. + * 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. * - * @member jQuery - * @param {String} expr The expression with which to filter + * @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' ); + * ok( !$('#form').is('div'), 'Check for element: A form is not a div' ); + * ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' ); + * ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' ); + * ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' ); + * ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' ); + * ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' ); + * ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' ); + * ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' ); + * ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' ); + * ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' ); + * ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' ); + * ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' ); + * ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' ); + * ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' ); + * ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' ); + * ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' ); + * ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' ); + * ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' ); + * ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' ); + * ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' ); + * 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 : this.length > 0; + return expr ? jQuery.filter(expr,this).r.length > 0 : false; }, /** - * + * * * @private * @name domManip @@ -966,11 +1219,11 @@ jQuery.fn = jQuery.prototype = { domManip: function(args, table, dir, fn){ var clone = this.size() > 1; var a = jQuery.clean(args); - + return this.each(function(){ var obj = this; - - if ( table && this.nodeName == "TABLE" && a[0].nodeName != "THEAD" ) { + + if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() != "THEAD" ) { var tbody = this.getElementsByTagName("tbody"); if ( !tbody.length ) { @@ -986,9 +1239,9 @@ jQuery.fn = jQuery.prototype = { } }); }, - + /** - * + * * * @private * @name pushStack @@ -999,17 +1252,23 @@ jQuery.fn = jQuery.prototype = { */ pushStack: function(a,args) { var fn = args && args[args.length-1]; + var fn2 = args && args[args.length-2]; + + if ( fn && fn.constructor != Function ) fn = null; + if ( fn2 && fn2.constructor != Function ) fn2 = null; - if ( !fn || fn.constructor != Function ) { + if ( !fn ) { 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 ); + + if ( fn2 && a.length || !fn2 ) + this.each( fn2 || fn ).get( old ); + else + this.get( old ).each( fn ); } return this; @@ -1017,7 +1276,20 @@ jQuery.fn = jQuery.prototype = { }; /** + * 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 @@ -1025,10 +1297,23 @@ jQuery.fn = jQuery.prototype = { * @type Object * @cat Core */ - + /** * 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 @@ -1037,8 +1322,17 @@ jQuery.fn = jQuery.prototype = { * @cat Javascript */ jQuery.extend = jQuery.fn.extend = function(obj,prop) { + // Watch for the case where null or undefined gets passed in by accident + if ( arguments.length > 1 && (prop === null || prop == undefined) ) + return obj; + + // If no property object was provided, then we're extending jQuery if ( !prop ) { prop = obj; obj = this; } + + // Extend the base object for ( var i in prop ) obj[i] = prop[i]; + + // Return the modified object return obj; }; @@ -1051,7 +1345,7 @@ jQuery.extend({ */ init: function(){ jQuery.initDone = true; - + jQuery.each( jQuery.macros.axis, function(i,n){ jQuery.fn[ i ] = function(a) { var ret = jQuery.map(this,n); @@ -1060,7 +1354,7 @@ jQuery.extend({ return this.pushStack( ret, arguments ); }; }); - + jQuery.each( jQuery.macros.to, function(i,n){ jQuery.fn[ i ] = function(){ var a = arguments; @@ -1070,7 +1364,7 @@ jQuery.extend({ }); }; }); - + jQuery.each( jQuery.macros.each, function(i,n){ jQuery.fn[ i ] = function() { return this.each( n, arguments ); @@ -1082,7 +1376,7 @@ jQuery.extend({ return this.filter( ":" + n + "(" + num + ")", fn ); }; }); - + jQuery.each( jQuery.macros.attr, function(i,n){ n = n || i; jQuery.fn[ i ] = function(h) { @@ -1091,7 +1385,7 @@ jQuery.extend({ this.attr( n, h ); }; }); - + jQuery.each( jQuery.macros.css, function(i,n){ jQuery.fn[ n ] = function(h) { return h == undefined ? @@ -1099,16 +1393,28 @@ jQuery.extend({ this.css( n, h ); }; }); - + }, - + /** * A generic iterator function, which can be used to seemlessly - * iterate over both objects and arrays. + * 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 Object fn The function that will be executed on every object. + * @param Function fn The function that will be executed on every object. * @type Object * @cat Javascript */ @@ -1118,19 +1424,28 @@ jQuery.extend({ 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 ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break; return obj; }, - + className: { add: function(o,c){ if (jQuery.className.has(o,c)) return; o.className += ( o.className ? " " : "" ) + c; }, 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; iI would like to say:
* @resultI would like to say:
I would like to say:
I would like to say:
HelloI would like to say:
* @resultI would like to say:
I would like to say:
I would like to say:
@@ -1978,10 +2428,10 @@ jQuery.macros = { */ insertAfter: "after" }, - + /** * Get the current CSS width of the first matched element. - * + * * @example $("p").width(); * @beforeThis is just a test.
* @result "300px" @@ -1990,12 +2440,12 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS width of every matched element. Be sure to include - * the "px" (or other unit of measurement) after the number that you + * the "px" (or other unit of measurement) after the number that you * specify, otherwise you might get strange results. - * + * * @example $("p").width("20px"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2005,10 +2455,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS height of the first matched element. - * + * * @example $("p").height(); * @beforeThis is just a test.
* @result "14px" @@ -2017,12 +2467,12 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS height of every matched element. Be sure to include - * the "px" (or other unit of measurement) after the number that you + * the "px" (or other unit of measurement) after the number that you * specify, otherwise you might get strange results. - * + * * @example $("p").height("20px"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2032,10 +2482,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS top of the first matched element. - * + * * @example $("p").top(); * @beforeThis is just a test.
* @result "0px" @@ -2044,12 +2494,12 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS top of every matched element. Be sure to include - * the "px" (or other unit of measurement) after the number that you + * the "px" (or other unit of measurement) after the number that you * specify, otherwise you might get strange results. - * + * * @example $("p").top("20px"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2059,10 +2509,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS left of the first matched element. - * + * * @example $("p").left(); * @beforeThis is just a test.
* @result "0px" @@ -2071,12 +2521,12 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS left of every matched element. Be sure to include - * the "px" (or other unit of measurement) after the number that you + * the "px" (or other unit of measurement) after the number that you * specify, otherwise you might get strange results. - * + * * @example $("p").left("20px"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2086,10 +2536,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS position of the first matched element. - * + * * @example $("p").position(); * @beforeThis is just a test.
* @result "static" @@ -2098,10 +2548,10 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS position of every matched element. - * + * * @example $("p").position("relative"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2111,10 +2561,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS float of the first matched element. - * + * * @example $("p").float(); * @beforeThis is just a test.
* @result "none" @@ -2123,10 +2573,10 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS float of every matched element. - * + * * @example $("p").float("left"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2136,10 +2586,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS overflow of the first matched element. - * + * * @example $("p").overflow(); * @beforeThis is just a test.
* @result "none" @@ -2148,10 +2598,10 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS overflow of every matched element. - * + * * @example $("p").overflow("auto"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2161,10 +2611,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS color of the first matched element. - * + * * @example $("p").color(); * @beforeThis is just a test.
* @result "black" @@ -2173,10 +2623,10 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS color of every matched element. - * + * * @example $("p").color("blue"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2186,10 +2636,10 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + /** * Get the current CSS background of the first matched element. - * + * * @example $("p").background(); * @beforeThis is just a test.
* @result "blue" @@ -2198,10 +2648,10 @@ jQuery.macros = { * @type String * @cat CSS */ - + /** * Set the CSS background of every matched element. - * + * * @example $("p").background("blue"); * @beforeThis is just a test.
* @resultThis is just a test.
@@ -2211,14 +2661,14 @@ jQuery.macros = { * @param String val Set the CSS property to the specified value. * @cat CSS */ - + css: "width,height,top,left,position,float,overflow,color,background".split(","), - + /** * Reduce the set of matched elements to a single element. * The position of the element in the set of matched elements * starts at 0 and goes to length - 1. - * + * * @example $("p").eq(1) * @beforeThis is just a test.
So is this
* @result [So is this
] @@ -2228,12 +2678,12 @@ jQuery.macros = { * @param Number pos The index of the element that you wish to limit to. * @cat Core */ - + /** * Reduce the set of matched elements to all elements before a given position. * The position of the element in the set of matched elements * starts at 0 and goes to length - 1. - * + * * @example $("p").lt(1) * @beforeThis is just a test.
So is this
* @result [This is just a test.
] @@ -2243,12 +2693,12 @@ jQuery.macros = { * @param Number pos Reduce the set to all elements below this position. * @cat Core */ - + /** * Reduce the set of matched elements to all elements after a given position. * The position of the element in the set of matched elements * starts at 0 and goes to length - 1. - * + * * @example $("p").gt(0) * @beforeThis is just a test.
So is this
* @result [So is this
] @@ -2258,10 +2708,10 @@ jQuery.macros = { * @param Number pos Reduce the set to all elements after this position. * @cat Core */ - + /** * Filter the set of elements to those that contain the specified text. - * + * * @example $("p").contains("test") * @beforeThis is just a test.
So is this
* @result [This is just a test.
] @@ -2277,33 +2727,41 @@ jQuery.macros = { attr: { /** * Get the current value of the first matched element. - * + * * @example $("input").val(); * @before * @result "some text" * + * @test ok( $("#text1").val() == "Test", "Check for value of input element" ); + * ok( !$("#text1").val() == "", "Check for value of input element" ); + * * @name val * @type String * @cat DOM/Attributes */ - + /** * Set the value of every matched element. - * - * @example $("input").value("test"); + * + * @example $("input").val("test"); * @before * @result * + * @test document.getElementById('text1').value = "bla"; + * ok( $("#text1").val() == "bla", "Check for modified value of input element" ); + * $("#text1").val('test'); + * ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" ); + * * @name val * @type jQuery * @param String val Set the property to the specified value. * @cat DOM/Attributes */ val: "value", - + /** * Get the html contents of the first matched element. - * + * * @example $("div").html(); * @before * @result @@ -2312,10 +2770,10 @@ jQuery.macros = { * @type String * @cat DOM/Attributes */ - + /** * Set the html contents of every matched element. - * + * * @example $("div").html("new stuff"); * @before * @resultHello
Hello AgainHello
] + * @result [ ...,Hello
] * * @name ancestors * @type jQuery @@ -2540,7 +3009,7 @@ jQuery.macros = { * * @example $("span").ancestors("p") * @beforeHello
Hello AgainHello
] + * @result [Hello
] * * @name ancestors * @type jQuery @@ -2548,14 +3017,14 @@ jQuery.macros = { * @cat DOM/Traversing */ ancestors: jQuery.parents, - + /** * Get a set of elements containing the unique ancestors of the matched * set of elements (except for the root element). * * @example $("span").ancestors() * @beforeHello
Hello AgainHello
] + * @result [ ...,Hello
] * * @name parents * @type jQuery @@ -2568,7 +3037,7 @@ jQuery.macros = { * * @example $("span").ancestors("p") * @beforeHello
Hello AgainHello
] + * @result [Hello
] * * @name parents * @type jQuery @@ -2578,9 +3047,9 @@ jQuery.macros = { parents: jQuery.parents, /** - * Get a set of elements containing the unique next siblings of each of the + * Get a set of elements containing the unique next siblings of each of the * matched set of elements. - * + * * It only returns the very next sibling, not all next siblings. * * @example $("p").next() @@ -2593,9 +3062,9 @@ jQuery.macros = { */ /** - * Get a set of elements containing the unique next siblings of each of the + * Get a set of elements containing the unique next siblings of each of the * matched set of elements, and filtered by an expression. - * + * * It only returns the very next sibling, not all next siblings. * * @example $("p").next(".selected") @@ -2610,12 +3079,12 @@ jQuery.macros = { next: "jQuery.sibling(a).next", /** - * Get a set of elements containing the unique previous siblings of each of the + * Get a set of elements containing the unique previous siblings of each of the * matched set of elements. - * + * * It only returns the immediately previous sibling, not all previous siblings. * - * @example $("p").previous() + * @example $("p").prev() * @beforeHello
And Again
* @result [Hello Again
And Again
* @result [Hello
And Again
* @result [Hello
,And Again
] * + * @test isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); + * * @name siblings * @type jQuery * @cat DOM/Traversing */ /** - * Get a set of elements containing all of the unique siblings of each of the + * Get a set of elements containing all of the unique siblings of each of the * matched set of elements, and filtered by an expression. * * @example $("div").siblings(".selected") * @beforeHello Again
And Again
* @result [Hello Again
] * + * @test isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" ); + * isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" ); + * * @name siblings * @type jQuery * @param String expr An expression to filter the sibling Elements with * @cat DOM/Traversing */ - siblings: jQuery.sibling, - - + siblings: "jQuery.sibling(a, null, true)", + + /** - * Get a set of elements containing all of the unique children of each of the + * Get a set of elements containing all of the unique children of each of the * matched set of elements. - * + * * @example $("div").children() * @beforeHello
And Again
* @result [ Hello Again ] * + * @test isSet( $("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" ); + * * @name children * @type jQuery * @cat DOM/Traversing */ /** - * Get a set of elements containing all of the unique children of each of the + * Get a set of elements containing all of the unique children of each of the * matched set of elements, and filtered by an expression. * * @example $("div").children(".selected") * @beforeHello Again
And Again
Hello Again
] * + * @test isSet( $("#foo").children("[code]").get(), q("sndp", "sap"), "Check for filtered children" ); + * * @name children * @type jQuery * @param String expr An expression to filter the child Elements with @@ -2719,7 +3197,7 @@ jQuery.macros = { /** * Displays each of the set of matched elements if they are hidden. - * + * * @example $("p").show() * @before * @result [Hello
] @@ -2763,7 +3241,7 @@ jQuery.macros = { this.oldblock = "block"; this.style.display = "none"; }, - + /** * Toggles each of the set of matched elements. If they are shown, * toggle makes them hidden. If they are hidden, toggle @@ -2780,7 +3258,7 @@ jQuery.macros = { toggle: function(){ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments ); }, - + /** * Adds the specified class to each of the set of matched elements. * @@ -2795,7 +3273,7 @@ jQuery.macros = { * if ( div.get(i).className.indexOf("test") == -1 ) pass = false; * } * ok( pass, "Add Class" ); - * + * * @name addClass * @type jQuery * @param String class A CSS class to add to the elements @@ -2804,7 +3282,7 @@ jQuery.macros = { addClass: function(c){ jQuery.className.add(this,c); }, - + /** * Removes the specified class from the set of matched elements. * @@ -2819,6 +3297,16 @@ jQuery.macros = { * if ( div.get(i).className.indexOf("test") != -1 ) pass = false; * } * ok( pass, "Remove Class" ); + * + * reset(); + * + * var div = $("div").addClass("test").addClass("foo").addClass("bar"); + * div.removeClass("test").removeClass("bar").removeClass("foo"); + * var pass = true; + * for ( var i = 0; i < div.size(); i++ ) { + * if ( div.get(i).className.match(/test|bar|foo/) ) pass = false; + * } + * ok( pass, "Remove multiple classes" ); * * @name removeClass * @type jQuery @@ -2828,7 +3316,7 @@ jQuery.macros = { removeClass: function(c){ jQuery.className.remove(this,c); }, - + /** * Adds the specified class if it is present, removes it if it is * not present. @@ -2845,7 +3333,7 @@ jQuery.macros = { toggleClass: function( c ){ jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this,c); }, - + /** * Removes all matched elements from the DOM. This does NOT remove them from the * jQuery object, allowing you to use the matched elements further. @@ -2858,7 +3346,7 @@ jQuery.macros = { * @type jQuery * @cat DOM/Manipulation */ - + /** * Removes only elements (out of the list of matched elements) that match * the specified jQuery expression. This does NOT remove them from the @@ -2877,7 +3365,7 @@ jQuery.macros = { if ( !a || jQuery.filter( a, [this] ).r ) this.parentNode.removeChild( this ); }, - + /** * Removes all child nodes from the set of matched elements. * @@ -2893,26 +3381,33 @@ jQuery.macros = { while ( this.firstChild ) this.removeChild( this.firstChild ); }, - + /** - * Binds a particular event (like click) to a each of a set of match elements. - * - * @example $("p").bind( "click", function() { alert("Hello"); } ) + * Binds a handler to a particular event (like click) for each matched element. + * The event handler is passed an event object that you can use to prevent + * default behaviour. To stop both default action and event bubbling, your handler + * has to return false. + * + * @example $("p").bind( "click", function() { + * alert( $(this).text() ); + * } ) * @beforeHello
- * @result [Hello
] - * - * Cancel a default action and prevent it from bubbling by returning false - * from your function. + * @result alert("Hello") * * @example $("form").bind( "submit", function() { return false; } ) + * @desc Cancel a default action and prevent it from bubbling by returning false + * from your function. * - * Cancel a default action by using the preventDefault method. - * - * @example $("form").bind( "submit", function() { e.preventDefault(); } ) + * @example $("form").bind( "submit", function(event) { + * event.preventDefault(); + * } ); + * @desc Cancel only the default action by using the preventDefault method. * - * Stop an event from bubbling by using the stopPropogation method. * - * @example $("form").bind( "submit", function() { e.stopPropogation(); } ) + * @example $("form").bind( "submit", function(event) { + * event.stopPropagation(); + * } ) + * @desc Stop only an event from bubbling by using the stopPropagation method. * * @name bind * @type jQuery @@ -2925,10 +3420,10 @@ jQuery.macros = { fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn); jQuery.event.add( this, type, fn ); }, - + /** * The opposite of bind, removes a bound event from each of the matched - * elements. You must pass the identical function that was used in the original + * elements. You must pass the identical function that was used in the original * bind method. * * @example $("p").unbind( "click", function() { alert("Hello"); } ) @@ -2941,7 +3436,7 @@ jQuery.macros = { * @param Function fn A function to unbind from the event on each of the set of matched elements * @cat Events */ - + /** * Removes all bound events of a particular type from each of the matched * elements. @@ -2955,7 +3450,7 @@ jQuery.macros = { * @param String type An event type * @cat Events */ - + /** * Removes all bound events from each of the matched elements. * @@ -2970,7 +3465,7 @@ jQuery.macros = { unbind: function( type, fn ) { jQuery.event.remove( this, type, fn ); }, - + /** * Trigger a type of event on every matched element. *