X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=d22d136f7eec4b0510bc7ba36c495ce49fdef9df;hb=c20924818c560f1afd9c60f188c8bc616583217b;hp=17e2a66a13568bce478d130c2bbc4d24e5111cb0;hpb=fa2aaf27c29769ca6611a77889321443db47e8e0;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 17e2a66..d22d136 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,31 +15,23 @@ window.undefined = window.undefined;
/**
* Create a new jQuery Object
*
- * @test ok( Array.prototype.push, "Array.push()" );
- * @test ok( Function.prototype.apply, "Function.apply()" );
- * @test ok( document.getElementById, "getElementById" );
- * @test ok( document.getElementsByTagName, "getElementsByTagName" );
- * @test ok( RegExp, "RegExp" );
- * @test ok( jQuery, "jQuery" );
- * @test ok( $, "$()" );
- *
* @constructor
* @private
* @name jQuery
* @cat Core
*/
-jQuery = function(a,c) {
+var jQuery = function(a,c) {
- // Shortcut for document ready (because $(document).each() is silly)
- if ( a && a.constructor == Function && jQuery.fn.ready )
+ // Shortcut for document 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
- a = a || jQuery.context || document;
+ a = a || document;
// Watch for when a jQuery object is passed as the selector
if ( a.jquery )
- return jQuery( jQuery.merge( a, [] ) );
+ return jQuery( jQuery.makeArray( a ) );
// Watch for when a jQuery object is passed at the context
if ( c && c.jquery )
@@ -50,41 +42,45 @@ jQuery = function(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.set( 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, [] ) :
+ jQuery.makeArray( 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,
- * basic XPath, or raw HTML, which is then used to match a set of elements.
- * The HTML string is different from the traditional selectors in that
- * it creates the DOM elements representing that HTML string, on the fly,
- * to be (assumedly) inserted into the document later.
+ * This function accepts a string containing a CSS or
+ * basic XPath selector which is then used to match a set of elements.
*
* The core functionality of jQuery centers around this function.
* Everything in jQuery is based upon this, or uses this in some way.
* The most basic use of this function is to pass in an expression
* (usually consisting of CSS or XPath), which then finds all matching
- * elements and remembers them for later use.
+ * elements.
*
* By default, $() looks for DOM elements within the context of the
* current HTML document.
@@ -94,26 +90,36 @@ if ( typeof $ != "undefined" )
* @before
one
two
three
* @result [
two
]
*
- * @example $("
Hello
").appendTo("#body")
- * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body.
+ * @example $("input:radio", document.forms[0])
+ * @desc Searches for all inputs of type radio within the first form in the document
+ *
+ * @example $("div", xml.responseXML)
+ * @desc This finds all div elements within the specified XML document.
*
* @name $
- * @param String expr An expression to search with, or a string of HTML to create on the fly.
+ * @param String expr An expression to search with
+ * @param Element context (optional) A DOM Element, or Document, representing the base context.
* @cat Core
* @type jQuery
+ * @see $(Element)
+ * @see $(Element)
*/
-
+
/**
- * This function accepts a string containing a CSS selector, or
- * basic XPath, which is then used to match a set of elements with the
- * context of the specified DOM element, or document
+ * This function accepts a string of raw HTML.
*
- * @example $("div", xml.responseXML)
- * @desc This finds all div elements within the specified XML document.
+ * 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.
+ *
+ * @example $("
Hello
").appendTo("#body")
+ * @desc Creates a div element (and all of its contents) dynamically,
+ * and appends it to the element with the ID of body. Internally, an
+ * element is created and it's innerHTML property set to the given markup.
+ * It is therefore both quite flexible and limited.
*
* @name $
- * @param String expr An expression to search with.
- * @param Element context A DOM Element, or Document, representing the base context.
+ * @param String html A string of HTML to create on the fly.
* @cat Core
* @type jQuery
*/
@@ -154,7 +160,10 @@ if ( typeof $ != "undefined" )
* behaves just like $(document).ready(), in that it should be used to wrap
* all of the other $() operations on your page. While this function is,
* technically, chainable - there really isn't much use for chaining against it.
+ * You can have as many $(document).ready events on your page as you like.
*
+ * See ready(Function) for details about the ready event.
+ *
* @example $(function(){
* // Document is ready
* });
@@ -181,12 +190,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
@@ -194,7 +200,7 @@ jQuery.fn = jQuery.prototype = {
* @type String
* @cat Core
*/
- jquery: "$Rev$",
+ jquery: "@VERSION",
/**
* The number of elements currently matched.
@@ -203,8 +209,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").length == 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
@@ -218,8 +222,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").size() == 2, "Get Number of Elements Found" );
- *
* @name size
* @type Number
* @cat Core
@@ -237,8 +239,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" );
- *
* @name get
* @type Array
* @cat Core
@@ -252,44 +252,39 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" );
- *
* @name get
* @type Element
* @param Number num Access the element in the Nth position.
* @cat Core
*/
+ get: function( num ) {
+ return num == undefined ?
+
+ // Return a 'clean' array
+ jQuery.makeArray( this ) :
+ // Return just the object
+ this[num];
+ },
+
/**
* Set the jQuery object to an array of elements.
*
- * @example $("img").get([ document.body ]);
- * @result $("img").get() == [ document.body ]
+ * @example $("img").set([ document.body ]);
+ * @result $("img").set() == [ document.body ]
*
* @private
- * @name get
+ * @name set
* @type jQuery
* @param Elements elems An array of elements
* @cat Core
*/
- get: function( num ) {
- // Watch for when an array (of elements) is passed in
- if ( num && num.constructor == Array ) {
-
- // Use a tricky hack to make the jQuery object
- // look and feel like an array
- this.length = 0;
- [].push.apply( this, num );
-
- return this;
- } else
- return num == undefined ?
-
- // Return a 'clean' array
- jQuery.merge( this, [] ) :
-
- // Return just the object
- this[num];
+ set: function( array ) {
+ // Use a tricky hack to make the jQuery object
+ // look and feel like an array
+ this.length = 0;
+ [].push.apply( this, array );
+ return this;
},
/**
@@ -302,25 +297,12 @@ jQuery.fn = jQuery.prototype = {
* argument representing the position of the element in the matched
* set.
*
- * @example $("img").each(function(){
- * this.src = "test.jpg";
- * });
- * @before
- * @result
- *
* @example $("img").each(function(i){
- * alert( "Image #" + i + " is " + this );
+ * this.src = "test" + i + ".jpg";
* });
* @before
- * @result
- *
- * @test var div = $("div");
- * div.each(function(){this.foo = 'zoo';});
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).foo != "zoo" ) pass = false;
- * }
- * ok( pass, "Execute a function, Relative" );
+ * @result
+ * @desc Iterates over two images and sets their src property
*
* @name each
* @type jQuery
@@ -348,16 +330,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result -1
*
- * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" );
- * @test ok( $([window, document]).index(document) == 1, "Check for index of elements" );
- * @test var inputElements = $('#radio1,#radio2,#check1,#check2');
- * @test ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );
- * @test ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );
- * @test ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );
- * @test ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );
- * @test ok( inputElements.index(window) == -1, "Check for not found index" );
- * @test ok( inputElements.index(document) == -1, "Check for not found index" );
- *
* @name index
* @type Number
* @param Object obj Object to search for
@@ -380,19 +352,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' );
- * @test ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
- * @test ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
- * @test ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
- * @test ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
- * @test ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
- * @test ok( $('#name').attr('name') == "name", 'Check for name attribute' );
- * @test ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
- * @test ok( $('#form').attr('action') == "formaction", 'Check for action attribute' );
- *
* @name attr
* @type Object
* @param String name The name of the property to access.
@@ -408,12 +367,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @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.
@@ -423,25 +376,14 @@ jQuery.fn = jQuery.prototype = {
/**
* Set a single property to a value, on all matched elements.
*
+ * Note that you can't set the name property of input elements in IE.
+ * Use $(html) or $().append(html) or $().html(html) to create elements
+ * on the fly including the name property.
+ *
* @example $("img").attr("src","test.jpg");
* @before
* @result
*
- * @test var div = $("div");
- * div.attr("foo", "bar");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
- * }
- * ok( pass, "Set Attribute" );
- *
- * @test $("#name").attr('name', 'something');
- * ok( $("#name").name() == 'something', 'Set name attribute' );
- * @test $("#check2").attr('checked', true);
- * ok( document.getElementById('check2').checked == true, 'Set checked attribute' );
- * $("#check2").attr('checked', false);
- * ok( document.getElementById('check2').checked == false, 'Set checked attribute' );
- *
* @name attr
* @type jQuery
* @param String key The name of the property to set.
@@ -450,7 +392,7 @@ jQuery.fn = jQuery.prototype = {
*/
attr: function( key, value, type ) {
// Check to see if we're setting style values
- return key.constructor != String || value != undefined ?
+ return typeof key != "string" || value != undefined ?
this.each(function(){
// See if we're setting a hash of styles
if ( value == undefined )
@@ -493,8 +435,6 @@ jQuery.fn = jQuery.prototype = {
* representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth,
* borderStyle, borderBottomWidth etc.
*
- * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"');
- *
* @name css
* @type Object
* @param String name The name of the property to access.
@@ -510,12 +450,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * @test $('#foo').css({display: 'none'});
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * @test $('#foo').css({display: 'block'});
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param Hash prop A set of key/value pairs to set as style properties.
@@ -530,13 +464,6 @@ jQuery.fn = jQuery.prototype = {
* @result
Test Paragraph.
* @desc Changes the color of all paragraphs to red
*
- *
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * @test $('#foo').css('display', 'none');
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * @test $('#foo').css('display', 'block');
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param String key The name of the property to set.
@@ -556,14 +483,31 @@ 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
+ */
+
+ /**
+ * Set the text contents of all matched elements. This has the same
+ * effect as calling .html() with your specified string.
+ *
+ * @example $("p").text("Some new text.");
+ * @before
Test Paragraph.
+ * @result
Some new text.
+ *
+ * @param String val The text value to set the contents of the element to.
*
* @name text
* @type String
* @cat DOM
*/
text: function(e) {
+ // A surprisingly high number of people expect the
+ // .text() method to do this, so lets do it!
+ if ( typeof e == "string" )
+ return this.html( e );
+
e = e || this;
var t = "";
for ( var j = 0; j < e.length; j++ ) {
@@ -594,11 +538,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap('
').text();
- * ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
- * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
- *
* @name wrap
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and wrapped around the target.
@@ -622,11 +561,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap(document.getElementById('empty')).parent();
- * ok( result.is('ol'), 'Check for element wrapping' );
- * ok( result.text() == defaultText, 'Check for element wrapping' );
- *
* @name wrap
* @type jQuery
* @param Element elem A DOM element that will be wrapped.
@@ -644,7 +578,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;
@@ -663,10 +597,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.
@@ -682,10 +612,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.
@@ -701,10 +627,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.
@@ -726,10 +648,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.
@@ -745,10 +663,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.
@@ -764,10 +678,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.
@@ -787,10 +697,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.
@@ -804,10 +710,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.
@@ -821,10 +723,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.
@@ -844,10 +742,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.
@@ -861,10 +755,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.
@@ -878,10 +768,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.
@@ -902,14 +788,14 @@ jQuery.fn = jQuery.prototype = {
* @before
*
- * @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
@@ -975,8 +854,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Hello
How are you?
* @result $("p").filter(".selected") == [
Hello
]
*
- * @test isSet( $("input").filter(":checked").get(), q("radio2", "check1"), "Filter elements" );
- *
* @name filter
* @type jQuery
* @param String expr An expression to search with.
@@ -1008,12 +885,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 );
@@ -1041,7 +919,6 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").not("#selected")
* @before
Hello
Hello Again
* @result [
Hello
]
- * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not")
*
* @name not
* @type jQuery
@@ -1049,8 +926,8 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Traversing
*/
not: function(t) {
- return this.pushStack( t.constructor == String ?
- jQuery.filter(t,this,false).r :
+ return this.pushStack( typeof t == "string" ?
+ jQuery.filter(t,this,true).r :
jQuery.grep(this,function(a){ return a != t; }), arguments );
},
@@ -1096,14 +973,16 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Traversing
*/
add: function(t) {
- return this.pushStack( jQuery.merge( this, t.constructor == String ?
- jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments );
+ return this.pushStack( jQuery.merge(
+ this.get(), typeof t == "string" ?
+ jQuery.find(t) :
+ t.constructor == Array ? t : [t] ), arguments );
},
/**
* 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.
+ * if at least one element of the selection fits the given expression.
+ * Does return false, if no element fits or the expression is not valid.
*
* @example $("input[@type='checkbox']").parent().is("form")
* @before
@@ -1120,29 +999,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
@@ -1151,40 +1007,32 @@ jQuery.fn = jQuery.prototype = {
is: function(expr) {
return expr ? jQuery.filter(expr,this).r.length > 0 : false;
},
-
+
/**
- *
- *
* @private
* @name domManip
* @param Array args
- * @param Boolean table
- * @param Number int
+ * @param Boolean table Insert TBODY in TABLEs if one is not found.
+ * @param Number dir If dir<0, process args in reverse order.
* @param Function fn The function doing the DOM manipulation.
* @type jQuery
* @cat Core
*/
domManip: function(args, table, dir, fn){
- var clone = this.size() > 1;
+ var clone = this.length > 1;
var a = jQuery.clean(args);
+ if ( dir < 0 )
+ a.reverse();
return this.each(function(){
var obj = this;
- if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() != "THEAD" ) {
- var tbody = this.getElementsByTagName("tbody");
+ if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+ obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
- if ( !tbody.length ) {
- obj = document.createElement("tbody");
- this.appendChild( obj );
- } else
- obj = tbody[0];
- }
+ for ( var i=0; i < a.length; i++ )
+ fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
- for ( var i = ( dir < 0 ? a.length - 1 : 0 );
- i != ( dir < 0 ? dir : a.length ); i += dir ) {
- fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
- }
});
},
@@ -1199,18 +1047,24 @@ jQuery.fn = jQuery.prototype = {
* @cat Core
*/
pushStack: function(a,args) {
- var fn = args && args[args.length-1];
+ var fn = args && args.length > 1 && args[args.length-1];
+ var fn2 = args && args.length > 2 && 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 );
+ this.set( a );
} else {
var old = this.get();
- this.get( a );
- if ( fn.constructor == Function )
- this.each( fn );
- this.get( old );
+ this.set( a );
+
+ if ( fn2 && a.length || !fn2 )
+ this.each( fn2 || fn ).set( old );
+ else
+ this.set( old ).each( fn );
}
return this;
@@ -1218,55 +1072,73 @@ jQuery.fn = jQuery.prototype = {
};
/**
- * Extends the jQuery object itself. Can be used to add both static
- * functions and plugin methods.
+ * Extends the jQuery object itself. Can be used to add functions into
+ * the jQuery namespace and to add plugin methods (plugins).
*
- * @example $.fn.extend({
+ * @example jQuery.fn.extend({
* check: function() {
- * this.each(function() { this.checked = true; });
+ * return this.each(function() { this.checked = true; });
* ),
* uncheck: function() {
- * this.each(function() { this.checked = false; });
+ * return this.each(function() { this.checked = false; });
* }
* });
* $("input[@type=checkbox]").check();
* $("input[@type=radio]").uncheck();
* @desc Adds two plugin methods.
*
- * @private
- * @name extend
- * @param Object obj
+ * @example jQuery.extend({
+ * min: function(a, b) { return a < b ? a : b; },
+ * max: function(a, b) { return a > b ? a : b; }
+ * });
+ * @desc Adds two functions into the jQuery namespace
+ *
+ * @name $.extend
+ * @param Object prop The object that will be merged into the jQuery object
* @type Object
* @cat Core
*/
/**
- * Extend one object with another, returning the original,
+ * Extend one object with one or more others, returning the original,
* modified, object. This is a great utility for simple inheritance.
*
* @example var settings = { validate: false, limit: 5, name: "foo" };
* var options = { validate: true, name: "bar" };
* jQuery.extend(settings, options);
* @result settings == { validate: true, limit: 5, name: "bar" }
+ * @desc Merge settings and options, modifying settings
*
- * @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" );
+ * @example var defaults = { validate: false, limit: 5, name: "foo" };
+ * var options = { validate: true, name: "bar" };
+ * var settings = jQuery.extend({}, defaults, options);
+ * @result settings == { validate: true, limit: 5, name: "bar" }
+ * @desc Merge defaults and options, without modifying the defaults
*
* @name $.extend
- * @param Object obj The object to extend
- * @param Object prop The object that will be merged into the first.
+ * @param Object target The object to extend
+ * @param Object prop1 The object that will be merged into the first.
+ * @param Object propN (optional) More objects to merge into the first
* @type Object
* @cat Javascript
*/
-jQuery.extend = jQuery.fn.extend = function(obj,prop) {
- if ( !prop ) { prop = obj; obj = this; }
- for ( var i in prop ) obj[i] = prop[i];
- return obj;
+jQuery.extend = jQuery.fn.extend = function() {
+ // copy reference to target object
+ var target = arguments[0],
+ a = 1;
+
+ // extend jQuery itself if only one argument is passed
+ if ( arguments.length == 1 ) {
+ target = this;
+ a = 0;
+ }
+ var prop;
+ while (prop = arguments[a++])
+ // Extend the base object
+ for ( var i in prop ) target[i] = prop[i];
+
+ // Return the modified object
+ return target;
};
jQuery.extend({
@@ -1282,7 +1154,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 );
};
@@ -1351,13 +1223,14 @@ jQuery.extend({
* @type Object
* @cat Javascript
*/
+ // args is for internal usage only
each: function( obj, fn, args ) {
if ( obj.length == undefined )
for ( var i in obj )
fn.apply( obj[i], args || [i, obj[i]] );
else
for ( var i = 0; i < obj.length; i++ )
- fn.apply( obj[i], args || [i, obj[i]] );
+ if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
return obj;
},
@@ -1367,9 +1240,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 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), s3 = s.substring(0,3), s6 = s.substring(0,6),
+ div = document.createElement("div"), wrap = [0,"",""];
+
+ if ( s.substring(0,4) == "", ""];
+ else if ( s6 == "", ""];
+ else if ( s3 == "", ""];
+ else if ( s3 == " matched above
+ wrap = [3, "
", "
"];
+
+ // Go to html and back, then peel off extra wrappers
+ div.innerHTML = wrap[1] + s + wrap[2];
+ while ( wrap[0]-- ) div = div.firstChild;
+
+ // Remove IE's autoinserted from table fragments
+ if ( jQuery.browser.msie ) {
+ var tb = null;
+ // String was a
, *may* have spurious
+ if ( s6 == " or
+ else if ( wrap[1] == "
" && s.indexOf("= 0 ; --n )
+ if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
+ tb[n].parentNode.removeChild(tb[n]);
+ }
}
+
+ 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()) );
+ }
- 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;
- }
+ return r;
+ },
- 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()) );
+ nth: function(cur,result,dir){
+ result = result || 1;
+ var num = 0;
+ for ( ; cur; cur = cur[dir] ) {
+ if ( cur.nodeType == 1 ) num++;
+ if ( num == result || result == "even" && num % 2 == 0 && num > 1 ||
+ result == "odd" && num % 2 == 1 ) return cur;
}
- return r;
},
expr: {
"": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
- "#": "a.getAttribute('id')&&a.getAttribute('id')==m[2]",
+ "#": "a.getAttribute('id')==m[2]",
":": {
// Position Checks
lt: "i=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])",
"@": {
@@ -1544,155 +1473,82 @@ jQuery.extend({
"^=": "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"
+ "": "z",
+ _resort: function(m){
+ return ["", m[1], m[3], m[2], m[5]];
+ },
+ _prefix: "z=jQuery.attr(a,m[3]);"
},
"[": "jQuery.find(m[2],a).length"
},
+ /**
+ * All elements on a specified axis.
+ *
+ * @private
+ * @name $.sibling
+ * @type Array
+ * @param Element elem The element to find all the siblings of (including itself).
+ * @cat DOM/Traversing
+ */
+ sibling: function( n, elem ) {
+ var r = [];
+
+ for ( ; n; n = n.nextSibling ) {
+ if ( n.nodeType == 1 && (!elem || n != elem) )
+ r.push( n );
+ }
+
+ return r;
+ },
+
token: [
"\\.\\.|/\\.\\.", "a.parentNode",
">|/", "jQuery.sibling(a.firstChild)",
- "\\+", "jQuery.sibling(a).next",
+ "\\+", "jQuery.nth(a,2,'nextSibling')",
"~", 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;
+ var s = jQuery.sibling(a.parentNode.firstChild)
+ return s.slice(0, jQuery.inArray(a,s));
}
],
/**
- *
- * @test t( "Element Selector", "div", ["main","foo"] );
- * @test t( "Element Selector", "body", ["body"] );
- * @test t( "Element Selector", "html", ["html"] );
- * @test ok( $("*").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( "Non-existing part of attribute [@name*=bla]", "[@name*=bla]", [] );
- * @test t( "Non-existing start of attribute [@name^=bla]", "[@name^=bla]", [] );
- * @test t( "Non-existing end of attribute [@name$=bla]", "[@name$=bla]", [] );
- *
- * @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","name"] );
- * @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 ok( 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","name"] );
- * @test t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
- *
- * @test t( "Grouped Form Elements", "input[@name='foo[bar]']", ["hidden2"] );
- *
- * @test t( "All Children of ID", "#foo/*", ["sndp", "en", "sap"] );
- * @test t( "All Children of ID with no children", "#firstUL/*", [] );
- *
* @name $.find
* @type Array
* @private
* @cat Core
*/
find: function( t, context ) {
+ // Quickly handle non-string expressions
+ if ( typeof t != "string" )
+ return [ t ];
+
// Make sure that the context is a DOM Element
if ( context && context.nodeType == undefined )
context = null;
// Set the correct context (if none is provided)
- context = context || jQuery.context || document;
-
- if ( t.constructor != String ) return [t];
+ context = context || document;
+ // Handle the common XPath // expression
if ( !t.indexOf("//") ) {
context = context.documentElement;
t = t.substr(2,t.length);
+
+ // And the / root expression
} else if ( !t.indexOf("/") ) {
context = context.documentElement;
t = t.substr(1,t.length);
- // FIX Assume the root element is right :(
if ( t.indexOf("/") >= 1 )
t = t.substr(t.indexOf("/"),t.length);
}
- var ret = [context];
- var done = [];
- var last = null;
+ // Initialize the search
+ var ret = [context], done = [], last = null;
- while ( t.length > 0 && last != t ) {
+ // Continue while a selector expression exists, and while
+ // we're no longer looping upon ourselves
+ while ( t && last != t ) {
var r = [];
last = t;
@@ -1700,69 +1556,171 @@ jQuery.extend({
var foundToken = false;
- for ( var i = 0; i < jQuery.token.length; i += 2 ) {
- if ( foundToken ) continue;
-
- var re = new RegExp("^(" + jQuery.token[i] + ")");
- var m = re.exec(t);
-
- if ( m ) {
- r = ret = jQuery.map( ret, jQuery.token[i+1] );
- t = jQuery.trim( t.replace( re, "" ) );
- foundToken = true;
+ // An attempt at speeding up child selectors that
+ // point to a specific element tag
+ var re = /^[\/>]\s*([a-z0-9*-]+)/i;
+ var m = re.exec(t);
+
+ if ( m ) {
+ // Perform our own iteration and filter
+ for ( var i = 0; i < ret.length; i++ )
+ for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+ if ( c.nodeType == 1 && ( c.nodeName == m[1].toUpperCase() || m[1] == "*" ) )
+ r.push( c );
+
+ ret = r;
+ t = jQuery.trim( t.replace( re, "" ) );
+ foundToken = true;
+ } else {
+ // Look for pre-defined expression tokens
+ for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+ // Attempt to match each, individual, token in
+ // the specified order
+ var re = new RegExp("^(" + jQuery.token[i] + ")");
+ var m = re.exec(t);
+
+ // If the token match was found
+ if ( m ) {
+ // Map it against the token's handler
+ r = ret = jQuery.map( ret, jQuery.token[i+1].constructor == Function ?
+ jQuery.token[i+1] :
+ function(a){ return eval(jQuery.token[i+1]); });
+
+ // And remove the token
+ t = jQuery.trim( t.replace( re, "" ) );
+ foundToken = true;
+ break;
+ }
}
}
- if ( !foundToken ) {
+ // See if there's still an expression, and that we haven't already
+ // matched a token
+ if ( t && !foundToken ) {
+ // Handle multiple expressions
if ( !t.indexOf(",") || !t.indexOf("|") ) {
+ // Clean teh result set
if ( ret[0] == context ) ret.shift();
- done = jQuery.merge( done, ret );
+
+ // Merge the result sets
+ jQuery.merge( done, ret );
+
+ // Reset the context
r = ret = [context];
+
+ // Touch up the selector string
t = " " + t.substr(1,t.length);
+
} else {
- var re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
+ // Optomize for the case nodeName#idName
+ var re2 = /^([a-z0-9_-]+)(#)([a-z0-9\\*_-]*)/i;
var m = re2.exec(t);
+
+ // Re-organize the results, so that they're consistent
+ if ( m ) {
+ m = [ 0, m[2], m[3], m[1] ];
+
+ } else {
+ // Otherwise, do a traditional filter check for
+ // ID, class, and element selectors
+ re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
+ m = re2.exec(t);
+ }
+
+ // Try to do a global search by ID, where we can
+ if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
+ // Optimization for HTML document case
+ var oid = ret[ret.length-1].getElementById(m[2]);
+
+ // Do a quick check for node name (where applicable) so
+ // that div#foo searches will be really fast
+ ret = r = oid &&
+ (!m[3] || oid.nodeName == m[3].toUpperCase()) ? [oid] : [];
+
+ // Use the DOM 0 shortcut for the body element
+ } else if ( m[1] == "" && m[2] == "body" ) {
+ ret = r = [ document.body ];
- if ( m[1] == "#" ) {
- // Ummm, should make this work in all XML docs
- var oid = document.getElementById(m[2]);
- r = ret = oid ? [oid] : [];
- t = t.replace( re2, "" );
} else {
- if ( !m[2] || m[1] == "." ) m[2] = "*";
+ // Pre-compile a regular expression to handle class searches
+ if ( m[1] == "." )
+ var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
+ // We need to find all descendant elements, it is more
+ // efficient to use getAll() when we are already further down
+ // the tree - we try to recognize that here
for ( var i = 0; i < ret.length; i++ )
- r = jQuery.merge( r,
- m[2] == "*" ?
- jQuery.getAll(ret[i]) :
- ret[i].getElementsByTagName(m[2])
+ jQuery.merge( r,
+ m[1] != "" && ret.length != 1 ?
+ jQuery.getAll( ret[i], [], m[1], m[2], rec ) :
+ ret[i].getElementsByTagName( m[1] != "" || m[0] == "" ? "*" : m[2] )
);
+
+ // It's faster to filter by class and be done with it
+ if ( m[1] == "." && ret.length == 1 )
+ r = jQuery.grep( r, function(e) {
+ return rec.test(e.className);
+ });
+
+ // Same with ID filtering
+ if ( m[1] == "#" && ret.length == 1 ) {
+ // Remember, then wipe out, the result set
+ var tmp = r;
+ r = [];
+
+ // Then try to find the element with the ID
+ for ( var i = 0; i < tmp.length; i++ )
+ if ( tmp[i].getAttribute("id") == m[2] ) {
+ r = [ tmp[i] ];
+ break;
+ }
+ }
+
+ ret = r;
}
+
+ t = t.replace( re2, "" );
}
}
+ // If a selector string still exists
if ( t ) {
+ // Attempt to filter it
var val = jQuery.filter(t,r);
ret = r = val.r;
t = jQuery.trim(val.t);
}
}
+ // Remove the root context
if ( ret && ret[0] == context ) ret.shift();
- done = jQuery.merge( done, ret );
+
+ // And combine the results
+ jQuery.merge( done, ret );
return done;
},
- getAll: function(o,r) {
- r = r || [];
- var s = o.childNodes;
- for ( var i = 0; i < s.length; i++ )
- if ( s[i].nodeType == 1 ) {
- r.push( s[i] );
- jQuery.getAll( s[i], r );
+ getAll: function( o, r, token, name, re ) {
+ for ( var s = o.firstChild; s; s = s.nextSibling )
+ if ( s.nodeType == 1 ) {
+ var add = true;
+
+ if ( token == "." )
+ add = s.className && re.test(s.className);
+ else if ( token == "#" )
+ add = s.getAttribute('id') == name;
+
+ if ( add )
+ r.push( s );
+
+ if ( token == "#" && r.length ) break;
+
+ if ( s.firstChild )
+ jQuery.getAll( s, r, token, name, re );
}
+
return r;
},
@@ -1770,20 +1728,49 @@ 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",
+ selected: "selected"
};
+
+ // 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
+ // Force it by setting the zoom level
+ elem.zoom = 1;
+
+ // Set the alpha filter to set the opacity
+ return elem.filter = elem.filter.replace(/alpha\([^\)]*\)/gi,"") +
+ ( value == 1 ? "" : "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;
+ // Certain attributes only work when accessed via the old DOM 0 way
if ( fix[name] ) {
if ( value != undefined ) elem[fix[name]] = value;
return elem[fix[name]];
- } else if ( elem.getAttribute != undefined ) {
+
+ } else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
+ return elem.getAttributeNode(name).nodeValue;
+
+ // IE elem.getAttribute passes even for style
+ } else if ( elem.tagName ) {
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;
@@ -1794,50 +1781,38 @@ jQuery.extend({
// The regular expressions that power the parsing engine
parse: [
// Match: [@value='test'], [@foo]
- "\\[ *(@)S *([!*$^=]*)Q\\]",
+ "\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]",
// Match: [div], [div p]
- "(\\[)Q\\]",
+ "(\\[)\s*(.*?)\s*\\]",
// Match: :contains('foo')
- "(:)S\\(Q\\)",
+ "(:)S\\(\"?'?([^\\)]*?)\"?'?\\)",
// Match: :even, :last-chlid
"([:.#]*)S"
],
filter: function(t,r,not) {
- // Figure out if we're doing regular, or inverse, filtering
- var g = not !== false ? jQuery.grep :
- function(a,f) {return jQuery.grep(a,f,true);};
-
+ // Look for common filter expressions
while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
var p = jQuery.parse;
for ( var i = 0; i < p.length; i++ ) {
- // get number for backreference
- var br = 0;
- if(p[i].indexOf('Q') != -1){
- br = p[i].replace(/\\\(/g,'').match(/\(|S/g).length+1;
- }
- var re = new RegExp( "^" + p[i]
-
- // Look for a string-like sequence
- .replace( 'S', "([a-z*_-][a-z0-9_-]*)" )
-
- // Look for something (optionally) enclosed with quotes
- .replace( 'Q', " *('|\"|)([^'\"]*?)\\"+br+" *" ), "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(br == 4){
- m = ["",m[1], m[3], m[2], m[5]];
- } else if(br != 0) {
- m.splice(br,1);
- }
+ // Re-organize the first match
+ if ( jQuery.expr[ m[1] ]._resort )
+ m = jQuery.expr[ m[1] ]._resort( m );
+
// Remove what we just matched
t = t.replace( re, "" );
@@ -1845,24 +1820,33 @@ 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;
+ r = jQuery.filter(m[3], r, true).r;
+
+ // Handle classes as a special case (this will help to
+ // improve the speed, as the regexp will only be compiled once)
+ else if ( m[1] == "." ) {
+
+ var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
+ r = jQuery.grep( r, function(e){
+ return re.test(e.className || '');
+ }, not);
// Otherwise, find the expression to execute
- else {
+ } else {
var f = jQuery.expr[m[1]];
- if ( f.constructor != String )
+ if ( typeof f != "string" )
f = jQuery.expr[m[1]][m[2]];
// Build a custom macro to enclose it
eval("f = function(a,i){" +
- ( m[1] == "@" ? "z=jQuery.attr(a,m[3]);" : "" ) +
+ ( jQuery.expr[ m[1] ]._prefix || "" ) +
"return " + f + "}");
// Execute it against the current filter
- r = g( r, f );
+ r = jQuery.grep( r, f, not );
}
}
@@ -1905,36 +1889,23 @@ jQuery.extend({
return matched;
},
- /**
- * All elements on a specified axis.
- *
- * @private
- * @name $.sibling
- * @type Array
- * @param Element elem The element to find all the siblings of (including itself).
- * @cat DOM/Traversing
- */
- sibling: function(elem, pos, not) {
- var elems = [];
-
- 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;
- }
- }
+ makeArray: function( a ) {
+ var r = [];
- return jQuery.extend( elems, {
- last: elems.n == elems.length - 1,
- cur: pos == "even" && elems.n % 2 == 0 || pos == "odd" && elems.n % 2 || elems[pos] == elem,
- prev: elems[elems.n - 1],
- next: elems[elems.n + 1]
- });
+ if ( a.constructor != Array ) {
+ for ( var i = 0; i < a.length; i++ )
+ r.push( a[i] );
+ } else
+ r = a.slice( 0 );
+
+ return r;
+ },
+
+ inArray: function( b, a ) {
+ for ( var i = 0; i < a.length; i++ )
+ if ( a[i] == b )
+ return i;
+ return -1;
},
/**
@@ -1955,29 +1926,18 @@ jQuery.extend({
* @cat Javascript
*/
merge: function(first, second) {
- var result = [];
+ var r = [].slice.call( first, 0 );
- // Move b over to the new array (this helps to avoid
- // StaticNodeList instances)
- for ( var k = 0; k < first.length; k++ )
- result[k] = first[k];
-
- // Now check for duplicates between a and b and only
- // add the unique items
+ // Now check for duplicates between the two arrays
+ // and only add the unique items
for ( var i = 0; i < second.length; i++ ) {
- var noCollision = true;
-
- // The collision-checking process
- for ( var j = 0; j < first.length; j++ )
- if ( second[i] == first[j] )
- noCollision = false;
-
- // If the item is unique, add it
- if ( noCollision )
- result.push( second[i] );
+ // Check for duplicates
+ if ( jQuery.inArray( second[i], r ) == -1 )
+ // The item is unique, add it
+ first.push( second[i] );
}
- return result;
+ return first;
},
/**
@@ -2002,7 +1962,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 = [];
@@ -2048,10 +2008,10 @@ 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 = [];
+ var result = [], r = [];
// Go through the array, translating each of the items to their
// new value (or values).
@@ -2060,11 +2020,21 @@ jQuery.extend({
if ( val !== null && val != undefined ) {
if ( val.constructor != Array ) val = [val];
- result = jQuery.merge( result, val );
+ result = result.concat( val );
}
}
- return result;
+ var r = [ result[0] ];
+
+ check: for ( var i = 1; i < result.length; i++ ) {
+ for ( var j = 0; j < i; j++ )
+ if ( result[i] == r[j] )
+ continue check;
+
+ r.push( result[i] );
+ }
+
+ return r;
},
/*
@@ -2132,8 +2102,8 @@ jQuery.extend({
},
trigger: function(type,data,element) {
- // Touch up the incoming data
- data = data || [];
+ // Clone the incoming data, if any
+ data = jQuery.makeArray(data || []);
// Handle a global trigger
if ( !element ) {
@@ -2153,12 +2123,9 @@ jQuery.extend({
},
handle: function(event) {
- if ( typeof jQuery == "undefined" ) return;
-
- event = event || jQuery.event.fix( window.event );
+ if ( typeof jQuery == "undefined" ) return false;
- // If no correct event was found, fail
- if ( !event ) return;
+ event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
var returnValue = true;
@@ -2175,26 +2142,81 @@ jQuery.extend({
}
}
+ // 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 ) {
+ // Fix target property, if necessary
+ if ( !event.target && event.srcElement )
+ event.target = event.srcElement;
+
+ // Calculate pageX/Y if missing and clientX/Y available
+ if ( typeof event.pageX == "undefined" && typeof event.clientX != "undefined" ) {
+ 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
+ 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.
+ *
+ * There are situations where object detections is not reliable enough, in that
+ * cases it makes sense to use browser detection. Simply try to avoid both!
+ *
+ * A combination of browser and object detection yields quite reliable results.
+ *
+ * @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
+ *
+ * @property
+ * @name $.browser
+ * @type Boolean
+ * @cat Javascript
+ */
+
+/*
+ * Wheather the W3C compliant box model is being used.
+ *
+ * @property
+ * @name $.boxModel
+ * @type Boolean
+ * @cat Javascript
+ */
new function() {
var b = navigator.userAgent.toLowerCase();
@@ -2584,9 +2606,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
@@ -2595,15 +2614,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.
@@ -2613,6 +2627,7 @@ jQuery.macros = {
/**
* Get the html contents of the first matched element.
+ * This property is not available on XML documents.
*
* @example $("div").html();
* @before
@@ -2625,19 +2640,12 @@ jQuery.macros = {
/**
* Set the html contents of every matched element.
+ * This property is not available on XML documents.
*
* @example $("div").html("new stuff");
* @before
* @result
new stuff
*
- * @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.
@@ -2917,7 +2925,7 @@ jQuery.macros = {
* @param String expr An expression to filter the next Elements with
* @cat DOM/Traversing
*/
- next: "jQuery.sibling(a).next",
+ next: "jQuery.nth(a,1,'nextSibling')",
/**
* Get a set of elements containing the unique previous siblings of each of the
@@ -2925,7 +2933,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
]
*
@@ -2940,7 +2948,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
]
*
@@ -2949,7 +2957,7 @@ jQuery.macros = {
* @param String expr An expression to filter the previous Elements with
* @cat DOM/Traversing
*/
- prev: "jQuery.sibling(a).prev",
+ prev: "jQuery.nth(a,1,'previousSibling')",
/**
* Get a set of elements containing all of the unique siblings of each of the
@@ -2959,8 +2967,6 @@ jQuery.macros = {
* @before
]
*
- * @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
@@ -3127,14 +3116,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
@@ -3145,8 +3126,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
* @result 2
*
- * @test ok( $("div").length == 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
@@ -218,8 +222,6 @@ jQuery.fn = jQuery.prototype = {
* @before 
