X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e12245c05616bd63af54e03f4f5313e1de0319b8;hb=68313e77488d98d7419e87c7090d4ec9b9d4882b;hp=65732b8f7a0b9d7ccfa5e41d84cff7510081840d;hpb=97ea47492fe13ddb1108045c244d5af6570ace92;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 65732b8..e12245c 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1,5 +1,5 @@ /* - * jQuery - New Wave Javascript + * jQuery @VERSION - New Wave Javascript * * Copyright (c) 2006 John Resig (jquery.com) * Dual licensed under the MIT (MIT-LICENSE.txt) @@ -15,23 +15,15 @@ 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 */ -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 @@ -50,28 +42,35 @@ function jQuery(a,c) { return new jQuery(a,c); // Handle HTML strings - var m = /^[^<]*(<.+>)[^>]*$/.exec(a); - if ( m ) a = jQuery.clean( [ m[1] ] ); + if ( typeof a == "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._$ = $; + +// Map the jQuery namespace to the '$' one +var $ = jQuery; /** * This function accepts a string containing a CSS selector, @@ -95,7 +94,10 @@ if ( typeof $ != "undefined" ) * @result [

two

] * * @example $("

Hello

").appendTo("#body") - * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body. + * @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 expr An expression to search with, or a string of HTML to create on the fly. @@ -127,9 +129,8 @@ if ( typeof $ != "undefined" ) * @before

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. @@ -151,10 +152,16 @@ if ( typeof $ != "undefined" ) /** * 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. @@ -163,11 +170,13 @@ if ( typeof $ != "undefined" ) */ /** - * 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. @@ -175,12 +184,9 @@ if ( typeof $ != "undefined" ) * @type jQuery */ -// Map the jQuery namespace to the '$' one -var $ = jQuery; - jQuery.fn = jQuery.prototype = { /** - * The current SVN version of jQuery. + * The current version of jQuery. * * @private * @property @@ -188,7 +194,7 @@ jQuery.fn = jQuery.prototype = { * @type String * @cat Core */ - jquery: "$Rev$", + jquery: "@VERSION", /** * The number of elements currently matched. @@ -197,8 +203,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" ); - * * @property * @name length * @type Number @@ -212,8 +216,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" ); - * * @name size * @type Number * @cat Core @@ -231,8 +233,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result [ ] * - * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" ); - * * @name get * @type Array * @cat Core @@ -246,8 +246,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result [ ] * - * @test cmpOK( $("div").get(0), "==", document.getElementById("main"), "Get A Single Element" ); - * * @name get * @type Element * @param Number num Access the element in the Nth position. @@ -308,14 +306,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result * - * @test var div = $("div"); - * div.each(function(){this.foo = 'zoo';}); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).foo != "zoo" ) pass = false; - * } - * ok( pass, "Execute a function, Relative" ); - * * @name each * @type jQuery * @param Function fn A function to execute @@ -342,16 +332,6 @@ jQuery.fn = jQuery.prototype = { * @before
* @result -1 * - * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" ); - * ok( $([window, document]).index(document) == 1, "Check for index of elements" ); - * var inputElements = $('#radio1,#radio2,#check1,#check2'); - * ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" ); - * ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" ); - * ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" ); - * ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" ); - * ok( inputElements.index(window) == -1, "Check for not found index" ); - * ok( inputElements.index(document) == -1, "Check for not found index" ); - * * @name index * @type Number * @param Object obj Object to search for @@ -374,11 +354,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result test.jpg * - * @test ok( $('#text1').attr('value') == "Test", 'Check for value attribute' ); - * @test ok( $('#text1').attr('type') == "text", 'Check for type attribute' ); - * @test ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' ); - * @test ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' ); - * * @name attr * @type Object * @param String name The name of the property to access. @@ -394,12 +369,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result Test Image * - * @test var pass = true; - * $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){ - * if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false; - * }); - * ok( pass, "Set Multiple Attributes" ); - * * @name attr * @type jQuery * @param Hash prop A set of key/value pairs to set as object properties. @@ -413,14 +382,6 @@ jQuery.fn = jQuery.prototype = { * @before * @result * - * @test var div = $("div"); - * div.attr("foo", "bar"); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false; - * } - * ok( pass, "Set Attribute" ); - * * @name attr * @type jQuery * @param String key The name of the property to set. @@ -460,8 +421,17 @@ jQuery.fn = jQuery.prototype = { * @example $("p").css("color"); * @before

Test Paragraph.

* @result red - * - * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"'); + * @desc Retrieves the color style of the first paragraph + * + * @example $("p").css("fontWeight"); + * @before

Test 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. * * @name css * @type Object @@ -478,12 +448,6 @@ jQuery.fn = jQuery.prototype = { * @before

Test Paragraph.

* @result

Test 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'); - * * @name css * @type jQuery * @param Hash prop A set of key/value pairs to set as style properties. @@ -496,12 +460,7 @@ jQuery.fn = jQuery.prototype = { * @example $("p").css("color","red"); * @before

Test Paragraph.

* @result

Test 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'); + * @desc Changes the color of all paragraphs to red * * @name css * @type jQuery @@ -522,9 +481,6 @@ jQuery.fn = jQuery.prototype = { * @before

Test 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 @@ -553,15 +509,13 @@ jQuery.fn = jQuery.prototype = { * 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.

- * - * @test var defaultText = 'Try them out:' - * var result = $('#first').wrap('
xxyy
').text() - * ok( 'xx' + defaultText + 'yy' == result, 'Check for wrapping' ); - * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper div has class "red"' ); - * + * * @name wrap * @type jQuery * @param String html A string of HTML, that will be created on the fly and wrapped around the target. @@ -578,9 +532,12 @@ jQuery.fn = jQuery.prototype = { * provided and finding the deepest ancestor element within its * structure - it is that element that will en-wrap everything else. * - * @example $("p").wrap("
"); - * @before

Test Paragraph.

- * @result

Test Paragraph.

+ * 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 @@ -599,7 +556,7 @@ jQuery.fn = jQuery.prototype = { // Insert it before the element to be wrapped this.parentNode.insertBefore( b, this ); - // Find he deepest point in the wrap structure + // Find the deepest point in the wrap structure while ( b.firstChild ) b = b.firstChild; @@ -618,10 +575,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

* @result

I would like to say: Hello

* - * @test var defaultText = 'Try them out:' - * var result = $('#first').append('buga'); - * ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); - * * @name append * @type jQuery * @param String html A string of HTML, that will be created on the fly and appended to the target. @@ -637,10 +590,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result

I would like to say: Hello

* - * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:"; - * $('#sap').append(document.getElementById('first')); - * ok( expected == $('#sap').text(), "Check for appending of element" ); - * * @name append * @type jQuery * @param Element elem A DOM element that will be appended. @@ -656,10 +605,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result

I would like to say: Hello

* - * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; - * $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]); - * ok( expected == $('#sap').text(), "Check for appending of array of elements" ); - * * @name append * @type jQuery * @param Array elems An array of elements, all of which will be appended. @@ -681,10 +626,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

* @result

HelloI would like to say:

* - * @test var defaultText = 'Try them out:' - * var result = $('#first').prepend('buga'); - * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' ); - * * @name prepend * @type jQuery * @param String html A string of HTML, that will be created on the fly and appended to the target. @@ -700,10 +641,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result

HelloI would like to say:

* - * @test var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog"; - * $('#sap').prepend(document.getElementById('first')); - * ok( expected == $('#sap').text(), "Check for prepending of element" ); - * * @name prepend * @type jQuery * @param Element elem A DOM element that will be appended. @@ -719,10 +656,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result

HelloI would like to say:

* - * @test var expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; - * $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]); - * ok( expected == $('#sap').text(), "Check for prepending of array of elements" ); - * * @name prepend * @type jQuery * @param Array elems An array of elements, all of which will be appended. @@ -742,10 +675,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

* @result Hello

I would like to say:

* - * @test var expected = 'This is a normal link: bugaYahoo'; - * $('#yahoo').before('buga'); - * ok( expected == $('#en').text(), 'Insert String before' ); - * * @name before * @type jQuery * @param String html A string of HTML, that will be created on the fly and appended to the target. @@ -759,10 +688,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result Hello

I would like to say:

* - * @test var expected = "This is a normal link: Try them out:Yahoo"; - * $('#yahoo').before(document.getElementById('first')); - * ok( expected == $('#en').text(), "Insert element before" ); - * * @name before * @type jQuery * @param Element elem A DOM element that will be appended. @@ -776,10 +701,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

Hello * @result Hello

I would like to say:

* - * @test var expected = "This is a normal link: Try them out:diveintomarkYahoo"; - * $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]); - * ok( expected == $('#en').text(), "Insert array of elements before" ); - * * @name before * @type jQuery * @param Array elems An array of elements, all of which will be appended. @@ -799,10 +720,6 @@ jQuery.fn = jQuery.prototype = { * @before

I would like to say:

* @result

I would like to say:

Hello * - * @test var expected = 'This is a normal link: Yahoobuga'; - * $('#yahoo').after('buga'); - * ok( expected == $('#en').text(), 'Insert String after' ); - * * @name after * @type jQuery * @param String html A string of HTML, that will be created on the fly and appended to the target. @@ -816,10 +733,6 @@ jQuery.fn = jQuery.prototype = { * @before Hello

I would like to say:

* @result

I would like to say:

Hello * - * @test var expected = "This is a normal link: YahooTry them out:"; - * $('#yahoo').after(document.getElementById('first')); - * ok( expected == $('#en').text(), "Insert element after" ); - * * @name after * @type jQuery * @param Element elem A DOM element that will be appended. @@ -833,10 +746,6 @@ jQuery.fn = jQuery.prototype = { * @before Hello

I would like to say:

* @result

I would like to say:

Hello * - * @test var expected = "This is a normal link: YahooTry them out:diveintomark"; - * $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]); - * ok( expected == $('#en').text(), "Insert array of elements after" ); - * * @name after * @type jQuery * @param Array elems An array of elements, all of which will be appended. @@ -857,13 +766,13 @@ jQuery.fn = jQuery.prototype = { * @before

Hello, 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() { + if( !(this.stack && this.stack.length) ) + return this; return this.get( this.stack.pop() ); }, @@ -879,8 +788,6 @@ jQuery.fn = jQuery.prototype = { * @before

Hello, 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. @@ -903,11 +810,6 @@ jQuery.fn = jQuery.prototype = { * @before Hello

, how are you?

* @result Hello

Hello, how are you?

* - * @test ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' ); - * var clone = $('#yahoo').clone(); - * ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' ); - * ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' ); - * * @name clone * @type jQuery * @cat DOM/Manipulation @@ -961,12 +863,13 @@ jQuery.fn = jQuery.prototype = { for ( var i = 0; i < t.length; i++ ) if ( jQuery.filter(t[i],[a]).r.length ) return a; + return null; }) || t.constructor == Boolean && ( t ? this.get() : [] ) || - t.constructor == Function && + typeof t == "function" && jQuery.grep( this, t ) || jQuery.filter(t,this).r, arguments ); @@ -994,7 +897,6 @@ jQuery.fn = jQuery.prototype = { * @example $("p").not("#selected") * @before

Hello

Hello Again

* @result [

Hello

] - * @test cmpOK($("#main > p#ap > a").not("#google").length, "==", 2, ".not") * * @name not * @type jQuery @@ -1002,7 +904,7 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ not: function(t) { - return this.pushStack( t.constructor == String ? + return this.pushStack( typeof t == "string" ? jQuery.filter(t,this,false).r : jQuery.grep(this,function(a){ return a != t; }), arguments ); }, @@ -1049,7 +951,7 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ add: function(t) { - return this.pushStack( jQuery.merge( this, t.constructor == String ? + return this.pushStack( jQuery.merge( this, typeof t == "string" ? jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments ); }, @@ -1073,29 +975,6 @@ jQuery.fn = jQuery.prototype = { * @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 @@ -1104,7 +983,7 @@ jQuery.fn = jQuery.prototype = { is: function(expr) { return expr ? jQuery.filter(expr,this).r.length > 0 : false; }, - + /** * * @@ -1124,7 +1003,7 @@ jQuery.fn = jQuery.prototype = { 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 ) { @@ -1153,17 +1032,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; @@ -1171,7 +1056,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 @@ -1189,14 +1087,6 @@ jQuery.fn = jQuery.prototype = { * 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. @@ -1204,8 +1094,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; }; @@ -1222,7 +1121,7 @@ jQuery.extend({ jQuery.each( jQuery.macros.axis, function(i,n){ jQuery.fn[ i ] = function(a) { var ret = jQuery.map(this,n); - if ( a && a.constructor == String ) + if ( a && typeof a == "string" ) ret = jQuery.filter(a,ret).r; return this.pushStack( ret, arguments ); }; @@ -1271,11 +1170,23 @@ jQuery.extend({ /** * 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 */ @@ -1285,7 +1196,7 @@ 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; }, @@ -1295,9 +1206,18 @@ jQuery.extend({ 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; i"; - } else if ( !a[i].indexOf(""; - } else if ( !a[i].indexOf(""; - } - - var div = document.createElement("div"); - div.innerHTML = a[i]; - - if ( table ) { - div = div.firstChild; - if ( table != "thead" ) div = div.firstChild; - if ( table == "td" ) div = div.firstChild; - } - - for ( var j = 0; j < div.childNodes.length; j++ ) - r.push( div.childNodes[j] ); - } else if ( a[i].jquery || a[i].length && !a[i].nodeType ) - for ( var k = 0; k < a[i].length; k++ ) - r.push( a[i][k] ); - else if ( a[i] !== null ) - r.push( a[i].nodeType ? a[i] : document.createTextNode(a[i].toString()) ); + var arg = a[i]; + if ( typeof arg == "string" ) { // Convert html string into DOM nodes + // Trim whitespace, otherwise indexOf won't work as expected + var s = jQuery.trim(arg), div = document.createElement("div"), wrap = [0,"",""]; + + if ( !s.indexOf("", ""]; + else if ( !s.indexOf("", ""]; + else if ( !s.indexOf("", ""]; // tbody auto-inserted + else if ( !s.indexOf("", ""]; + + // Go to html and back, then peel off extra wrappers + div.innerHTML = wrap[1] + s + wrap[2]; + while ( wrap[0]-- ) div = div.firstChild; + arg = div.childNodes; + } + + + if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function + for ( var n = 0; n < arg.length; n++ ) // Handles Array, jQuery, DOM NodeList collections + r.push(arg[n]); + else + r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) ); } + return r; }, @@ -1453,25 +1379,37 @@ jQuery.extend({ empty: "!a.childNodes.length", // Text Check - contains: "(a.innerText||a.innerHTML).indexOf(m[3])>=0", + contains: "jQuery.fn.text.apply([a]).indexOf(m[3])>=0", // Visibility visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'", hidden: "a.type=='hidden'||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'", - // Form elements + // Form attributes enabled: "!a.disabled", disabled: "a.disabled", checked: "a.checked", - selected: "a.selected" + selected: "a.selected || jQuery.attr(a, 'selected')", + + // Form elements + text: "a.type=='text'", + radio: "a.type=='radio'", + checkbox: "a.type=='checkbox'", + file: "a.type=='file'", + password: "a.type=='password'", + submit: "a.type=='submit'", + image: "a.type=='image'", + reset: "a.type=='reset'", + button: "a.type=='button'", + input: "/input|select|textarea|button/i.test(a.nodeName)" }, ".": "jQuery.className.has(a,m[2])", "@": { "=": "z==m[4]", "!=": "z!=m[4]", - "^=": "!z.indexOf(m[4])", - "$=": "z.substr(z.length - m[4].length,m[4].length)==m[4]", - "*=": "z.indexOf(m[4])>=0", + "^=": "z && !z.indexOf(m[4])", + "$=": "z && z.substr(z.length - m[4].length,m[4].length)==m[4]", + "*=": "z && z.indexOf(m[4])>=0", "": "z" }, "[": "jQuery.find(m[2],a).length" @@ -1482,104 +1420,12 @@ jQuery.extend({ ">|/", "jQuery.sibling(a.firstChild)", "\\+", "jQuery.sibling(a).next", "~", function(a){ - var r = []; var s = jQuery.sibling(a); - if ( s.n > 0 ) - for ( var i = s.n; i < s.length; i++ ) - r.push( s[i] ); - return r; + return s.n >= 0 ? s.slice(s.n+1) : []; } ], /** - * - * @test t( "Element Selector", "div", ["main","foo"] ); - * @test t( "Element Selector", "body", ["body"] ); - * @test t( "Element Selector", "html", ["html"] ); - * @test cmpOK( $("*").size(), ">=", 30, "Element Selector" ); - * @test t( "Parent Element", "div div", ["foo"] ); - * - * @test t( "ID Selector", "#body", ["body"] ); - * @test t( "ID Selector w/ Element", "body#body", ["body"] ); - * @test t( "ID Selector w/ Element", "ul#first", [] ); - * - * @test t( "Class Selector", ".blog", ["mark","simon"] ); - * @test t( "Class Selector", ".blog.link", ["simon"] ); - * @test t( "Class Selector w/ Element", "a.blog", ["mark","simon"] ); - * @test t( "Parent Class Selector", "p .blog", ["mark","simon"] ); - * - * @test t( "Comma Support", "a.blog, div", ["mark","simon","main","foo"] ); - * @test t( "Comma Support", "a.blog , div", ["mark","simon","main","foo"] ); - * @test t( "Comma Support", "a.blog ,div", ["mark","simon","main","foo"] ); - * @test t( "Comma Support", "a.blog,div", ["mark","simon","main","foo"] ); - * - * @test t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] ); - * @test t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] ); - * @test t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] ); - * @test t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] ); - * @test t( "Child w/ Class", "p > a.blog", ["mark","simon"] ); - * @test t( "All Children", "code > *", ["anchor1","anchor2"] ); - * @test t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] ); - * @test t( "Adjacent", "a + a", ["groups"] ); - * @test t( "Adjacent", "a +a", ["groups"] ); - * @test t( "Adjacent", "a+ a", ["groups"] ); - * @test t( "Adjacent", "a+a", ["groups"] ); - * @test t( "Adjacent", "p + p", ["ap","en","sap"] ); - * @test t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] ); - * @test t( "First Child", "p:first-child", ["firstp","sndp"] ); - * @test t( "Attribute Exists", "a[@title]", ["google"] ); - * @test t( "Attribute Exists", "*[@title]", ["google"] ); - * @test t( "Attribute Exists", "[@title]", ["google"] ); - * @test t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] ); - * @test t( "Attribute Equals", 'a[@rel="bookmark"]', ["simon1"] ); - * @test t( "Attribute Equals", "a[@rel=bookmark]", ["simon1"] ); - * @test t( "Multiple Attribute Equals", "input[@type='hidden'],input[@type='radio']", ["hidden1","radio1","radio2"] ); - * @test t( "Multiple Attribute Equals", "input[@type=\"hidden\"],input[@type='radio']", ["hidden1","radio1","radio2"] ); - * @test t( "Multiple Attribute Equals", "input[@type=hidden],input[@type=radio]", ["hidden1","radio1","radio2"] ); - * - * @test t( "Attribute Begins With", "a[@href ^= 'http://www']", ["google","yahoo"] ); - * @test t( "Attribute Ends With", "a[@href $= 'org/']", ["mark"] ); - * @test t( "Attribute Contains", "a[@href *= 'google']", ["google","groups"] ); - * @test t( "First Child", "p:first-child", ["firstp","sndp"] ); - * @test t( "Last Child", "p:last-child", ["sap"] ); - * @test t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] ); - * @test t( "Empty", "ul:empty", ["firstUL"] ); - * @test t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2"] ); - * @test t( "Disabled UI Element", "input:disabled", ["text2"] ); - * @test t( "Checked UI Element", "input:checked", ["radio2","check1"] ); - * @test t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] ); - * @test t( "Text Contains", "a:contains('Google')", ["google","groups"] ); - * @test t( "Text Contains", "a:contains('Google Groups')", ["groups"] ); - * @test t( "Element Preceded By", "p ~ div", ["foo"] ); - * @test t( "Not", "a.blog:not(.link)", ["mark"] ); - * - * @test cmpOK( jQuery.find("//*").length, ">=", 30, "All Elements (//*)" ); - * @test t( "All Div Elements", "//div", ["main","foo"] ); - * @test t( "Absolute Path", "/html/body", ["body"] ); - * @test t( "Absolute Path w/ *", "/* /body", ["body"] ); - * @test t( "Long Absolute Path", "/html/body/dl/div/div/p", ["sndp","en","sap"] ); - * @test t( "Absolute and Relative Paths", "/html//div", ["main","foo"] ); - * @test t( "All Children, Explicit", "//code/*", ["anchor1","anchor2"] ); - * @test t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] ); - * @test t( "Attribute Exists", "//a[@title]", ["google"] ); - * @test t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] ); - * @test t( "Parent Axis", "//p/..", ["main","foo"] ); - * @test t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] ); - * @test t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] ); - * @test t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] ); - * - * @test t( "nth Element", "p:nth(1)", ["ap"] ); - * @test t( "First Element", "p:first", ["firstp"] ); - * @test t( "Last Element", "p:last", ["first"] ); - * @test t( "Even Elements", "p:even", ["firstp","sndp","sap"] ); - * @test t( "Odd Elements", "p:odd", ["ap","en","first"] ); - * @test t( "Position Equals", "p:eq(1)", ["ap"] ); - * @test t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] ); - * @test t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] ); - * @test t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] ); - * @test t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2"] ); - * @test t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] ); - * * @name $.find * @type Array * @private @@ -1688,20 +1534,40 @@ jQuery.extend({ var fix = { "for": "htmlFor", "class": "className", - "float": "cssFloat", + "float": jQuery.browser.msie ? "styleFloat" : "cssFloat", + cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat", innerHTML: "innerHTML", className: "className", value: "value", disabled: "disabled", - checked: "checked" + checked: "checked", + readonly: "readOnly" }; + + // IE actually uses filters for opacity ... elem is actually elem.style + if (name == "opacity" && jQuery.browser.msie && value != undefined) { + // IE has trouble with opacity if it does not have layout + // Would prefer to check element.hasLayout first but don't have access to the element here + elem['zoom'] = 1; + if (value == 1) // Remove filter to avoid more IE weirdness + return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,""); + else + return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,"") + "alpha(opacity=" + value * 100 + ")"; + } else if (name == "opacity" && jQuery.browser.msie) { + return elem["filter"] ? parseFloat( elem["filter"].match(/alpha\(opacity=(.*)\)/)[1] )/100 : 1; + } + + // Mozilla doesn't play well with opacity 1 + if (name == "opacity" && jQuery.browser.mozilla && value == 1) value = 0.9999; if ( fix[name] ) { if ( value != undefined ) elem[fix[name]] = value; return elem[fix[name]]; - } else if ( elem.getAttribute ) { + } else if( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) { + return elem.getAttributeNode(name).nodeValue; + } else if ( elem.tagName ) { // IE elem.getAttribute passes even for style if ( value != undefined ) elem.setAttribute( name, value ); - return elem.getAttribute( name, 2 ); + return elem.getAttribute( name ); } else { name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();}); if ( value != undefined ) elem[name] = value; @@ -1712,16 +1578,16 @@ jQuery.extend({ // The regular expressions that power the parsing engine parse: [ // Match: [@value='test'], [@foo] - [ "\\[ *(@)S *([!*$^=]*) *Q\\]", 1 ], + "\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]", // Match: [div], [div p] - [ "(\\[)Q\\]", 0 ], + "(\\[)\s*(.*?)\s*\\]", // Match: :contains('foo') - [ "(:)S\\(Q\\)", 0 ], + "(:)S\\(\"?'?([^\\)]*?)\"?'?\\)", // Match: :even, :last-chlid - [ "([:.#]*)S", 0 ] + "([:.#]*)S" ], filter: function(t,r,not) { @@ -1734,20 +1600,18 @@ jQuery.extend({ var p = jQuery.parse; for ( var i = 0; i < p.length; i++ ) { - var re = new RegExp( "^" + p[i][0] - - // Look for a string-like sequence - .replace( 'S', "([a-z*_-][a-z0-9_-]*)" ) - - // Look for something (optionally) enclosed with quotes - .replace( 'Q', " *'?\"?([^'\"]*?)'?\"? *" ), "i" ); + + // Look for, and replace, string-like sequences + // and finally build a regexp out of it + var re = new RegExp( + "^" + p[i].replace("S", "([a-z*_-][a-z0-9_-]*)"), "i" ); var m = re.exec( t ); if ( m ) { - // Re-organize the match - if ( p[i][1] ) - m = ["", m[1], m[3], m[2], m[4]]; + // Re-organize the first match + if ( !i ) + m = ["",m[1], m[3], m[2], m[5]]; // Remove what we just matched t = t.replace( re, "" ); @@ -1756,7 +1620,7 @@ jQuery.extend({ } } - // :not() is a special case that can be optomized by + // :not() is a special case that can be optimized by // keeping it out of the expression list if ( m[1] == ":" && m[2] == "not" ) r = jQuery.filter(m[3],r,false).r; @@ -1785,6 +1649,9 @@ jQuery.extend({ /** * Remove the whitespace from the beginning and end of a string. * + * @example $.trim(" hello, how are you? "); + * @result "hello, how are you?" + * * @name $.trim * @type String * @param String str The string to trim. @@ -1824,15 +1691,17 @@ jQuery.extend({ */ sibling: function(elem, pos, not) { var elems = []; - - var siblings = elem.parentNode.childNodes; - for ( var i = 0; i < siblings.length; i++ ) { - if ( not === true && siblings[i] == elem ) continue; - - if ( siblings[i].nodeType == 1 ) - elems.push( siblings[i] ); - if ( siblings[i] == elem ) - elems.n = elems.length - 1; + + if(elem) { + var siblings = elem.parentNode.childNodes; + for ( var i = 0; i < siblings.length; i++ ) { + if ( not === true && siblings[i] == elem ) continue; + + if ( siblings[i].nodeType == 1 ) + elems.push( siblings[i] ); + if ( siblings[i] == elem ) + elems.n = elems.length - 1; + } } return jQuery.extend( elems, { @@ -1844,12 +1713,20 @@ jQuery.extend({ }, /** - * Merge two arrays together, removing all duplicates. + * Merge two arrays together, removing all duplicates. The final order + * or the new array is: All the results from the first array, followed + * by the unique results from the second array. + * + * @example $.merge( [0,1,2], [2,3,4] ) + * @result [0,1,2,3,4] + * + * @example $.merge( [3,2,1], [4,3,2] ) + * @result [3,2,1,4] * * @name $.merge * @type Array - * @param Array a The first array to merge. - * @param Array b The second array to merge. + * @param Array first The first array to merge. + * @param Array second The second array to merge. * @cat Javascript */ merge: function(first, second) { @@ -1879,9 +1756,16 @@ jQuery.extend({ }, /** - * Remove items that aren't matched in an array. The function passed - * in to this method will be passed two arguments: 'a' (which is the - * array item) and 'i' (which is the index of the item in the array). + * Filter items out of an array, by using a filter function. + * The specified function will be passed two arguments: The + * current array item and the index of the item in the array. The + * function should return 'true' if you wish to keep the item in + * the array, false if it should be removed. + * + * @example $.grep( [0,1,2], function(i){ + * return i > 0; + * }); + * @result [1, 2] * * @name $.grep * @type Array @@ -1893,7 +1777,7 @@ jQuery.extend({ grep: function(elems, fn, inv) { // If a string is passed in for the function, make a function // for it (a handy shortcut) - if ( fn.constructor == String ) + if ( typeof fn == "string" ) fn = new Function("a","i","return " + fn); var result = []; @@ -1908,12 +1792,27 @@ jQuery.extend({ }, /** - * Translate all items in array to another array of items. The translation function - * that is provided to this method is passed one argument: 'a' (the item to be - * translated). If an array is returned, that array is mapped out and merged into - * the full array. Additionally, returning 'null' or 'undefined' will delete the item - * from the array. Both of these changes imply that the size of the array may not - * be the same size upon completion, as it was when it started. + * Translate all items in an array to another array of items. + * The translation function that is provided to this method is + * called for each item in the array and is passed one argument: + * The item to be translated. The function can then return: + * The translated value, 'null' (to remove the item), or + * an array of values - which will be flattened into the full array. + * + * @example $.map( [0,1,2], function(i){ + * return i + 4; + * }); + * @result [4, 5, 6] + * + * @example $.map( [0,1,2], function(i){ + * return i > 0 ? i + 1 : null; + * }); + * @result [2, 3] + * + * @example $.map( [0,1,2], function(i){ + * return [ i, i + 1 ]; + * }); + * @result [0, 1, 1, 2, 2, 3] * * @name $.map * @type Array @@ -1924,7 +1823,7 @@ jQuery.extend({ map: function(elems, fn) { // If a string is passed in for the function, make a function // for it (a handy shortcut) - if ( fn.constructor == String ) + if ( typeof fn == "string" ) fn = new Function("a","return " + fn); var result = []; @@ -2008,8 +1907,8 @@ jQuery.extend({ }, trigger: function(type,data,element) { - // Touch up the incoming data - data = data || []; + // Clone the incoming data, if any + data = $.merge([], data || []); // Handle a global trigger if ( !element ) { @@ -2029,45 +1928,90 @@ jQuery.extend({ }, handle: function(event) { - if ( typeof jQuery == "undefined" ) return; + if ( typeof jQuery == "undefined" ) return false; - event = event || jQuery.event.fix( window.event ); + event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data // If no correct event was found, fail - if ( !event ) return; + if ( !event ) return false; var returnValue = true; var c = this.events[event.type]; + var args = [].slice.call( arguments, 1 ); + args.unshift( event ); + for ( var j in c ) { - if ( c[j].apply( this, [event] ) === false ) { + if ( c[j].apply( this, args ) === false ) { event.preventDefault(); event.stopPropagation(); returnValue = false; } } + // Clean up added properties in IE to prevent memory leak + if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = null; + return returnValue; }, fix: function(event) { - if ( event ) { + // check IE + if(jQuery.browser.msie) { + // fix target property, if available + // check prevents overwriting of fake target coming from trigger + if(event.srcElement) + event.target = event.srcElement; + + // calculate pageX/Y + var e = document.documentElement, b = document.body; + event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft); + event.pageY = event.clientY + (e.scrollTop || b.scrollTop); + + // check safari and if target is a textnode + } else if(jQuery.browser.safari && event.target.nodeType == 3) { + // target is readonly, clone the event object + event = jQuery.extend({}, event); + // get parentnode from textnode + event.target = event.target.parentNode; + } + + // fix preventDefault and stopPropagation + if (!event.preventDefault) event.preventDefault = function() { this.returnValue = false; }; - + + if (!event.stopPropagation) event.stopPropagation = function() { this.cancelBubble = true; }; - } - + return event; } - } }); +/** + * Contains flags for the useragent, read from navigator.userAgent. + * Available flags are: safari, opera, msie, mozilla + * This property is available before the DOM is ready, therefore you can + * use it to add ready events only for certain browsers. + * + * See + * jQBrowser plugin for advanced browser detection: + * + * @example $.browser.msie + * @desc returns true if the current useragent is some version of microsoft's internet explorer + * + * @example if($.browser.safari) { $( function() { alert("this is safari!"); } ); } + * @desc Alerts "this is safari!" only for safari browsers + * + * @name $.browser + * @type Boolean + * @cat Javascript + */ new function() { var b = navigator.userAgent.toLowerCase(); @@ -2457,9 +2401,6 @@ jQuery.macros = { * @before * @result "some text" * - * @test ok( $("#text1").val() == "Test", "Check for value of input element" ); - * @test ok( !$("#text1").val() == "", "Check for value of input element" ); - * * @name val * @type String * @cat DOM/Attributes @@ -2468,15 +2409,10 @@ jQuery.macros = { /** * 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. @@ -2503,14 +2439,6 @@ jQuery.macros = { * @before
* @result
new stuff
* - * @test var div = $("div"); - * div.html("test"); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).childNodes.length == 0 ) pass = false; - * } - * ok( pass, "Set HTML" ); - * * @name html * @type jQuery * @param String val Set the html contents to the specified value. @@ -2798,7 +2726,7 @@ jQuery.macros = { * * It only returns the immediately previous sibling, not all previous siblings. * - * @example $("p").previous() + * @example $("p").prev() * @before

Hello

Hello Again

And Again

* @result [
Hello Again
] * @@ -2813,7 +2741,7 @@ jQuery.macros = { * * It only returns the immediately previous sibling, not all previous siblings. * - * @example $("p").previous(".selected") + * @example $("p").prev(".selected") * @before
Hello

Hello Again

And Again

* @result [
Hello
] * @@ -2850,7 +2778,7 @@ jQuery.macros = { * @param String expr An expression to filter the sibling Elements with * @cat DOM/Traversing */ - siblings: jQuery.sibling, + siblings: "jQuery.sibling(a, null, true)", /** @@ -2907,12 +2835,6 @@ jQuery.macros = { * @before

Hello

* @result [

Hello

] * - * @test var pass = true, div = $("div"); - * div.show().each(function(){ - * if ( this.style.display == "none" ) pass = false; - * }); - * ok( pass, "Show" ); - * * @name show * @type jQuery * @cat Effects @@ -2971,14 +2893,6 @@ jQuery.macros = { * @before

Hello

* @result [

Hello

] * - * @test var div = $("div"); - * div.addClass("test"); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * 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 @@ -2995,14 +2909,6 @@ jQuery.macros = { * @before

Hello

* @result [

Hello

] * - * @test var div = $("div").addClass("test"); - * div.removeClass("test"); - * var pass = true; - * for ( var i = 0; i < div.size(); i++ ) { - * if ( div.get(i).className.indexOf("test") != -1 ) pass = false; - * } - * ok( pass, "Remove Class" ); - * * @name removeClass * @type jQuery * @param String class A CSS class to remove from the elements @@ -3013,8 +2919,8 @@ jQuery.macros = { }, /** - * Adds the specified class if it is present, removes it if it is - * not present. + * Adds the specified class if it is not present, removes it if it is + * present. * * @example $("p").toggleClass("selected") * @before

Hello

Hello Again

@@ -3078,24 +2984,31 @@ jQuery.macros = { }, /** - * 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() ); + * } ) * @before

Hello

- * @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 @@ -3104,8 +3017,6 @@ jQuery.macros = { * @cat Events */ bind: function( type, fn ) { - if ( fn.constructor == String ) - fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn); jQuery.event.add( this, type, fn ); },