X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=b6bffc7c9735df7b8615153b537c0ea541e4a44a;hb=232da5dde03ae774980c9800950e60f3f4468c68;hp=08f325c34a8c1af2d1c0bb77b495587090cfca2a;hpb=23e255015fb5e4f5ce7e8dd091b1550e80cccdd9;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 08f325c..358c165 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,8 +1,8 @@
/*
- * jQuery - New Wave Javascript
+ * jQuery @VERSION - New Wave Javascript
*
* Copyright (c) 2006 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
* $Date$
@@ -15,88 +15,184 @@ 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) {
-
- // Initalize the extra macro functions
- if ( !jQuery.initDone ) jQuery.init();
+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;
-
- /*
- * Handle support for overriding other $() functions. Way too many libraries
- * provide this function to simply ignore it and overwrite it.
- */
- /*
- // Check to see if this is a possible collision case
- if ( jQuery._$ && !c && a.constructor == String &&
-
- // Make sure that the expression is a colliding one
- !/[^a-zA-Z0-9_-]/.test(a) &&
-
- // and that there are no elements that match it
- // (this is the one truly ambiguous case)
- !document.getElementsByTagName(a).length )
-
- // Use the default method, in case it works some voodoo
- return jQuery._$( a );
- */
+ a = a || document;
// Watch for when a jQuery object is passed as the selector
if ( a.jquery )
- return $( jQuery.merge( a, [] ) );
+ return jQuery( jQuery.makeArray( a ) );
// Watch for when a jQuery object is passed at the context
if ( c && c.jquery )
- return $( c ).find(a);
-
+ return jQuery( c ).find(a);
+
// If the context is global, return a new object
if ( window == this )
return new jQuery(a,c);
// Handle HTML strings
- var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
- if ( m ) a = jQuery.clean( [ m[1] ] );
+ if ( 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
var fn = arguments[ arguments.length - 1 ];
- if ( fn && fn.constructor == Function )
+
+ // If so, execute it in context
+ if ( fn && typeof fn == "function" )
this.each(fn);
-}
+
+ return this;
+};
// Map over the $ in case of overwrite
-if ( $ )
+if ( typeof $ != "undefined" )
jQuery._$ = $;
-
+
// Map the jQuery namespace to the '$' one
var $ = jQuery;
+/**
+ * This function accepts a string containing a CSS or
+ * basic XPath selector which is then used to match a set of elements.
+ *
+ * The core functionality of jQuery centers around this function.
+ * Everything in jQuery is based upon this, or uses this in some way.
+ * The most basic use of this function is to pass in an expression
+ * (usually consisting of CSS or XPath), which then finds all matching
+ * elements.
+ *
+ * By default, $() looks for DOM elements within the context of the
+ * current HTML document.
+ *
+ * @example $("div > p")
+ * @desc This finds all p elements that are children of a div element.
+ * @before
one
two
three
+ * @result [
two
]
+ *
+ * @example $("input:radio", document.forms[0])
+ * @desc Searches for all inputs of type radio within the first form in the document
+ *
+ * @example $("div", xml.responseXML)
+ * @desc This finds all div elements within the specified XML document.
+ *
+ * @name $
+ * @param String expr An expression to search with
+ * @param Element context (optional) A DOM Element, or Document, representing the base context.
+ * @cat Core
+ * @type jQuery
+ * @see $(Element)
+ * @see $(Element)
+ */
+
+/**
+ * This function accepts a string of raw HTML.
+ *
+ * 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 html A string of HTML to create on the fly.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * Wrap jQuery functionality around a specific DOM Element.
+ * This function also accepts XML Documents and Window objects
+ * as valid arguments (even though they are not DOM Elements).
+ *
+ * @example $(document).find("div > p")
+ * @before
one
two
three
+ * @result [
two
]
+ *
+ * @example $(document.body).background( "black" );
+ * @desc Sets the background color of the page to black.
+ *
+ * @name $
+ * @param Element elem A DOM element to be encapsulated by a jQuery object.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * Wrap jQuery functionality around a set of DOM Elements.
+ *
+ * @example $( myForm.elements ).hide()
+ * @desc Hides all the input elements within a form
+ *
+ * @name $
+ * @param Array elems An array of DOM elements to be encapsulated by a jQuery object.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * A shorthand for $(document).ready(), allowing you to bind a function
+ * to be executed when the DOM document has finished loading. This function
+ * behaves just like $(document).ready(), in that it should be used to wrap
+ * all of the other $() operations on your page. While this function is,
+ * technically, chainable - there really isn't much use for chaining against it.
+ * You can have as many $(document).ready events on your page as you like.
+ *
+ * See ready(Function) for details about the ready event.
+ *
+ * @example $(function(){
+ * // Document is ready
+ * });
+ * @desc Executes the function when the DOM is ready to be used.
+ *
+ * @name $
+ * @param Function fn The function to execute when the DOM is ready.
+ * @cat Core
+ * @type jQuery
+ */
+
+/**
+ * A means of creating a cloned copy of a jQuery object. This function
+ * copies the set of matched elements from one jQuery object and creates
+ * another, new, jQuery object containing the same elements.
+ *
+ * @example var div = $("div");
+ * $( div ).find("p");
+ * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div' (as would normally be the case if a simple div.find("p") was done).
+ *
+ * @name $
+ * @param jQuery obj The jQuery object to be cloned.
+ * @cat Core
+ * @type jQuery
+ */
+
jQuery.fn = jQuery.prototype = {
/**
- * The current SVN version of jQuery.
+ * The current version of jQuery.
*
* @private
* @property
@@ -104,8 +200,8 @@ jQuery.fn = jQuery.prototype = {
* @type String
* @cat Core
*/
- jquery: "$Rev$",
-
+ jquery: "@VERSION",
+
/**
* The number of elements currently matched.
*
@@ -113,14 +209,12 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
* @cat Core
*/
-
+
/**
* The number of elements currently matched.
*
@@ -128,8 +222,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" );
- *
* @name size
* @type Number
* @cat Core
@@ -137,7 +229,7 @@ jQuery.fn = jQuery.prototype = {
size: function() {
return this.length;
},
-
+
/**
* Access all matched elements. This serves as a backwards-compatible
* way of accessing all matched elements (other than the jQuery object
@@ -147,59 +239,52 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" );
- *
* @name get
* @type Array
* @cat Core
*/
-
+
/**
- * Access a single matched element. num is used to access the
+ * Access a single matched element. num is used to access the
* Nth element matched.
*
* @example $("img").get(1);
* @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.
* @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.map( this, function(a){ return a } ) :
-
- // 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;
},
/**
@@ -212,17 +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"; });
+ * @example $("img").each(function(i){
+ * 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
@@ -233,6 +313,28 @@ jQuery.fn = jQuery.prototype = {
return jQuery.each( this, fn, args );
},
+ /**
+ * Searches every matched element for the object and returns
+ * the index of the element, if found, starting with zero.
+ * Returns -1 if the object wasn't found.
+ *
+ * @example $("*").index(document.getElementById('foobar'))
+ * @before
+ * @result 0
+ *
+ * @example $("*").index(document.getElementById('foo'))
+ * @before
+ * @result 2
+ *
+ * @example $("*").index(document.getElementById('bar'))
+ * @before
+ * @result -1
+ *
+ * @name index
+ * @type Number
+ * @param Object obj Object to search for
+ * @cat Core
+ */
index: function( obj ) {
var pos = -1;
this.each(function(i){
@@ -240,10 +342,10 @@ jQuery.fn = jQuery.prototype = {
});
return pos;
},
-
+
/**
* Access a property on the first matched element.
- * This method makes it easy to retreive a property value
+ * This method makes it easy to retrieve a property value
* from the first matched element.
*
* @example $("img").attr("src");
@@ -255,7 +357,7 @@ jQuery.fn = jQuery.prototype = {
* @param String name The name of the property to access.
* @cat DOM
*/
-
+
/**
* Set a hash of key/value object properties to all matched elements.
* This serves as the best way to set a large number of properties
@@ -265,35 +367,23 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var div = $("div");
- * div.attr({foo: 'baz', zoo: 'ping'});
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).foo != "baz" && div.get(i).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.
* @cat DOM
*/
-
+
/**
* 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).foo != "bar" ) pass = false;
- * }
- * ok( pass, "Set Attribute" );
- *
* @name attr
* @type jQuery
* @param String key The name of the property to set.
@@ -302,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 )
@@ -312,7 +402,7 @@ jQuery.fn = jQuery.prototype = {
type ? this.style : this,
prop, key[prop]
);
-
+
// See if we're setting a single key/value style
else
jQuery.attr(
@@ -320,26 +410,37 @@ jQuery.fn = jQuery.prototype = {
key, value
);
}) :
-
+
// Look for the case where we're accessing a style value
jQuery[ type || "attr" ]( this[0], key );
},
/**
* Access a style property on the first matched element.
- * This method makes it easy to retreive a style property value
+ * This method makes it easy to retrieve a style property value
* from the first matched element.
*
- * @example $("p").css("red");
+ * @example $("p").css("color");
* @before
Test Paragraph.
* @result red
+ * @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
* @param String name The name of the property to access.
* @cat CSS
*/
-
+
/**
* Set a hash of key/value style properties to all matched elements.
* This serves as the best way to set a large number of style properties
@@ -354,13 +455,14 @@ jQuery.fn = jQuery.prototype = {
* @param Hash prop A set of key/value pairs to set as style properties.
* @cat CSS
*/
-
+
/**
* Set a single style property to a value, on all matched elements.
*
* @example $("p").css("color","red");
* @before
Test Paragraph.
* @result
Test Paragraph.
+ * @desc Changes the color of all paragraphs to red
*
* @name css
* @type jQuery
@@ -371,9 +473,9 @@ jQuery.fn = jQuery.prototype = {
css: function( key, value ) {
return this.attr( key, value, "curCSS" );
},
-
+
/**
- * Retreive the text contents of all matched elements. The result is
+ * Retrieve the text contents of all matched elements. The result is
* a string that contains the combined text contents of all matched
* elements. This method works on both HTML and XML documents.
*
@@ -391,70 +493,123 @@ jQuery.fn = jQuery.prototype = {
for ( var j = 0; j < e.length; j++ ) {
var r = e[j].childNodes;
for ( var i = 0; i < r.length; i++ )
- t += r[i].nodeType != 1 ?
- r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+ if ( r[i].nodeType != 8 )
+ t += r[i].nodeType != 1 ?
+ r[i].nodeValue : jQuery.fn.text([ r[i] ]);
}
return t;
},
-
+
/**
* Wrap all matched elements with a structure of other elements.
* This wrapping process is most useful for injecting additional
* stucture into a document, without ruining the original semantic
* qualities of a document.
*
- * The way that is works is that it goes through the first element argument
- * provided and finds the deepest element within the structure - it is that
- * element that will en-wrap everything else.
+ * This works by going through the first element
+ * provided (which is generated, on the fly, from the provided HTML)
+ * and finds the deepest ancestor element within its
+ * structure - it is that element that will en-wrap everything else.
+ *
+ * This does not work with elements that contain text. Any necessary text
+ * must be added after the wrapping is done.
*
* @example $("p").wrap("");
* @before
Test Paragraph.
* @result
Test Paragraph.
+ *
+ * @name wrap
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and wrapped around the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Wrap all matched elements with a structure of other elements.
+ * This wrapping process is most useful for injecting additional
+ * stucture into a document, without ruining the original semantic
+ * qualities of a document.
+ *
+ * This works by going through the first element
+ * provided and finding the deepest ancestor element within its
+ * structure - it is that element that will en-wrap everything else.
+ *
+ * This does not work with elements that contain text. Any necessary text
+ * must be added after the wrapping is done.
+ *
+ * @example $("p").wrap( document.getElementById('content') );
+ * @before
Test Paragraph.
+ * @result
Test Paragraph.
*
* @name wrap
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and wrapped around the target.
- * @any Element elem A DOM element that will be wrapped.
- * @any Array elems An array of elements, the first of which will be wrapped.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Element elem A DOM element that will be wrapped.
* @cat DOM/Manipulation
*/
wrap: function() {
// The elements to wrap the target around
var a = jQuery.clean(arguments);
-
+
// Wrap each of the matched elements individually
return this.each(function(){
// Clone the structure that we're using to wrap
var b = a[0].cloneNode(true);
-
+
// Insert it before the element to be wrapped
this.parentNode.insertBefore( b, this );
-
- // Find he deepest point in the wrap structure
+
+ // Find the deepest point in the wrap structure
while ( b.firstChild )
b = b.firstChild;
-
+
// Move the matched element to within the wrap structure
b.appendChild( this );
});
},
-
+
/**
- * Append any number of elements to the inside of all matched elements.
- * This operation is similar to doing an appendChild to all the
+ * Append any number of elements to the inside of every matched elements,
+ * generated from the provided HTML.
+ * This operation is similar to doing an appendChild to all the
* specified elements, adding them into the document.
- *
+ *
* @example $("p").append("Hello");
* @before
I would like to say:
* @result
I would like to say: Hello
*
* @name append
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and appended to the target.
- * @any Element elem A DOM element that will be appended.
- * @any Array elems An array of elements, all of which will be appended.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append an element to the inside of all matched elements.
+ * This operation is similar to doing an appendChild to all the
+ * specified elements, adding them into the document.
+ *
+ * @example $("p").append( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result
I would like to say: Hello
+ *
+ * @name append
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Append any number of elements to the inside of all matched elements.
+ * This operation is similar to doing an appendChild to all the
+ * specified elements, adding them into the document.
+ *
+ * @example $("p").append( $("b") );
+ * @before
I would like to say:
Hello
+ * @result
I would like to say: Hello
+ *
+ * @name append
+ * @type jQuery
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
append: function() {
@@ -462,22 +617,50 @@ jQuery.fn = jQuery.prototype = {
this.appendChild( a );
});
},
-
+
+ /**
+ * Prepend any number of elements to the inside of every matched elements,
+ * generated from the provided HTML.
+ * This operation is the best way to insert dynamically created elements
+ * inside, at the beginning, of all the matched element.
+ *
+ * @example $("p").prepend("Hello");
+ * @before
I would like to say:
+ * @result
HelloI would like to say:
+ *
+ * @name prepend
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Prepend an element to the inside of all matched elements.
+ * This operation is the best way to insert an element inside, at the
+ * beginning, of all the matched element.
+ *
+ * @example $("p").prepend( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result
HelloI would like to say:
+ *
+ * @name prepend
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
/**
* Prepend any number of elements to the inside of all matched elements.
- * This operation is the best way to insert a set of elements inside, at the
+ * This operation is the best way to insert a set of elements inside, at the
* beginning, of all the matched element.
- *
- * @example $("p").prepend("Hello");
- * @before
*
* @name prepend
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and prepended to the target.
- * @any Element elem A DOM element that will be prepended.
- * @any Array elems An array of elements, all of which will be prepended.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
prepend: function() {
@@ -485,20 +668,44 @@ jQuery.fn = jQuery.prototype = {
this.insertBefore( a, this.firstChild );
});
},
-
+
/**
- * Insert any number of elements before each of the matched elements.
- *
+ * Insert any number of dynamically generated elements before each of the
+ * matched elements.
+ *
* @example $("p").before("Hello");
- * @before
how are you?
- * @result Hello
how are you?
+ * @before
I would like to say:
+ * @result Hello
I would like to say:
+ *
+ * @name before
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert an element before each of the matched elements.
+ *
+ * @example $("p").before( $("#foo")[0] );
+ * @before
I would like to say:
Hello
+ * @result Hello
I would like to say:
+ *
+ * @name before
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert any number of elements before each of the matched elements.
+ *
+ * @example $("p").before( $("b") );
+ * @before
I would like to say:
Hello
+ * @result Hello
I would like to say:
*
* @name before
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and inserted.
- * @any Element elem A DOM element that will beinserted.
- * @any Array elems An array of elements, all of which will be inserted.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
before: function() {
@@ -506,20 +713,44 @@ jQuery.fn = jQuery.prototype = {
this.parentNode.insertBefore( a, this );
});
},
-
+
+ /**
+ * Insert any number of dynamically generated elements after each of the
+ * matched elements.
+ *
+ * @example $("p").after("Hello");
+ * @before
I would like to say:
+ * @result
I would like to say:
Hello
+ *
+ * @name after
+ * @type jQuery
+ * @param String html A string of HTML, that will be created on the fly and appended to the target.
+ * @cat DOM/Manipulation
+ */
+
+ /**
+ * Insert an element after each of the matched elements.
+ *
+ * @example $("p").after( $("#foo")[0] );
+ * @before Hello
I would like to say:
+ * @result
I would like to say:
Hello
+ *
+ * @name after
+ * @type jQuery
+ * @param Element elem A DOM element that will be appended.
+ * @cat DOM/Manipulation
+ */
+
/**
* Insert any number of elements after each of the matched elements.
- *
- * @example $("p").after("
Hello
*
* @name after
* @type jQuery
- * @any String html A string of HTML, that will be created on the fly and inserted.
- * @any Element elem A DOM element that will beinserted.
- * @any Array elems An array of elements, all of which will be inserted.
- * @any Object obj Any object, converted to a string, then a text node.
+ * @param Array elems An array of elements, all of which will be appended.
* @cat DOM/Manipulation
*/
after: function() {
@@ -527,10 +758,10 @@ jQuery.fn = jQuery.prototype = {
this.parentNode.insertBefore( a, this.nextSibling );
});
},
-
+
/**
* End the most recent 'destructive' operation, reverting the list of matched elements
- * back to its previous state. After an end operation, the list of matched elements will
+ * back to its previous state. After an end operation, the list of matched elements will
* revert to the last state of matched elements.
*
* @example $("p").find("span").end();
@@ -542,15 +773,17 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Traversing
*/
end: function() {
- return this.get( this.stack.pop() );
+ if( !(this.stack && this.stack.length) )
+ return this;
+ return this.set( this.stack.pop() );
},
-
+
/**
* Searches for all elements that match the specified expression.
* This method is the optimal way of finding additional descendant
* elements with which to process.
*
- * All searching is done using a jQuery expression. The expression can be
+ * All searching is done using a jQuery expression. The expression can be
* written using CSS 1-3 Selector syntax, or basic XPath.
*
* @example $("p").find("span");
@@ -568,20 +801,35 @@ jQuery.fn = jQuery.prototype = {
}), arguments );
},
+ /**
+ * Create cloned copies of all matched DOM Elements. This does
+ * not create a cloned copy of this particular jQuery object,
+ * instead it creates duplicate copies of all DOM Elements.
+ * This is useful for moving copies of the elements to another
+ * location in the DOM.
+ *
+ * @example $("b").clone().prependTo("p");
+ * @before Hello
, how are you?
+ * @result Hello
Hello, how are you?
+ *
+ * @name clone
+ * @type jQuery
+ * @cat DOM/Manipulation
+ */
clone: function(deep) {
return this.pushStack( jQuery.map( this, function(a){
return a.cloneNode( deep != undefined ? deep : true );
}), arguments );
},
-
+
/**
- * Removes all elements from the set of matched elements that do not
+ * Removes all elements from the set of matched elements that do not
* match the specified expression. This method is used to narrow down
* the results of a search.
*
* All searching is done using a jQuery expression. The expression
* can be written using CSS 1-3 Selector syntax, or basic XPath.
- *
+ *
* @example $("p").filter(".selected")
* @before
Hello
How are you?
* @result $("p").filter(".selected") == [
Hello
]
@@ -594,8 +842,8 @@ jQuery.fn = jQuery.prototype = {
/**
* Removes all elements from the set of matched elements that do not
- * match at least one of the expressions passed to the function. This
- * method is used when you want to filter the set of matched elements
+ * match at least one of the expressions passed to the function. This
+ * method is used when you want to filter the set of matched elements
* through more than one expression.
*
* Elements will be retained in the jQuery object if they match at
@@ -617,17 +865,18 @@ 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 );
},
-
+
/**
* Removes the specified Element from the set of matched elements. This
* method is used to remove a single Element from a jQuery object.
@@ -646,7 +895,7 @@ jQuery.fn = jQuery.prototype = {
* Removes elements matching the specified expression from the set
* of matched elements. This method is used to remove one or more
* elements from a jQuery object.
- *
+ *
* @example $("p").not("#selected")
* @before
Hello
Hello Again
* @result [
Hello
]
@@ -657,8 +906,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 );
},
@@ -687,7 +936,7 @@ jQuery.fn = jQuery.prototype = {
* @name add
* @type jQuery
* @param Array els An array of Elements to add
- * @cat jQuery
+ * @cat DOM/Traversing
*/
/**
@@ -701,84 +950,101 @@ jQuery.fn = jQuery.prototype = {
* @name add
* @type jQuery
* @param Element el An Element to add
- * @cat jQuery
+ * @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 );
},
-
+
/**
- * A wrapper function for each() to be used by append and prepend.
- * Handles cases where you're trying to modify the inner contents of
- * a table, when you actually need to work with the tbody.
+ * Checks the current selection against an expression and returns true,
+ * if 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
+ * @result true
+ * @desc Returns true, because the parent of the input is a form element
+ *
+ * @example $("input[@type='checkbox']").parent().is("form")
+ * @before
+ * @result false
+ * @desc Returns false, because the parent of the input is a p element
*
- * @member jQuery
- * @param {String} expr The expression with which to filter
+ * @example $("form").is(null)
+ * @before
+ * @result false
+ * @desc An invalid expression always returns false.
+ *
+ * @name is
* @type Boolean
- * @cat jQuery
+ * @param String expr The expression with which to filter
+ * @cat DOM/Traversing
*/
is: function(expr) {
- return expr ? jQuery.filter(expr,this).r.length > 0 : this.length > 0;
+ return expr ? jQuery.filter(expr,this).r.length > 0 : false;
},
/**
- *
- *
* @private
* @name domManip
* @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 == "TABLE" && a[0].nodeName != "THEAD" ) {
- var tbody = this.getElementsByTagName("tbody");
-
- if ( !tbody.length ) {
- obj = document.createElement("tbody");
- this.appendChild( obj );
- } else
- obj = tbody[0];
- }
- for ( var i = ( dir < 0 ? a.length - 1 : 0 );
- i != ( dir < 0 ? dir : a.length ); i += dir ) {
- fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
- }
+ if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+ obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
+
+ for ( var i=0; i < a.length; i++ )
+ fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
+
});
},
-
+
/**
- *
+ *
*
* @private
* @name pushStack
* @param Array a
* @param Array args
* @type jQuery
+ * @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 )
- return 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;
@@ -786,61 +1052,104 @@ jQuery.fn = jQuery.prototype = {
};
/**
+ * Extends the jQuery object itself. Can be used to add functions into
+ * the jQuery namespace and to add plugin methods (plugins).
*
+ * @example jQuery.fn.extend({
+ * check: function() {
+ * return this.each(function() { this.checked = true; });
+ * ),
+ * uncheck: function() {
+ * return this.each(function() { this.checked = false; });
+ * }
+ * });
+ * $("input[@type=checkbox]").check();
+ * $("input[@type=radio]").uncheck();
+ * @desc Adds two plugin methods.
*
- * @private
- * @name extend
- * @param Object obj
- * @param Object prop
+ * @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
+ *
+ * @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 jQuery.extend
- * @param Object obj The object to extend
- * @param Object prop The object that will be merged into the first.
+ * @name $.extend
+ * @param Object target The object to extend
+ * @param Object prop1 The object that will be merged into the first.
+ * @param Object propN (optional) More objects to merge into the first
* @type Object
* @cat Javascript
*/
-jQuery.extend = jQuery.fn.extend = function(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({
/**
- *
- *
* @private
* @name init
* @type undefined
+ * @cat Core
*/
init: function(){
jQuery.initDone = true;
-
+
jQuery.each( jQuery.macros.axis, function(i,n){
jQuery.fn[ i ] = function(a) {
var ret = jQuery.map(this,n);
- if ( a && a.constructor == String )
+ if ( a && typeof a == "string" )
ret = jQuery.filter(a,ret).r;
return this.pushStack( ret, arguments );
};
});
-
+
jQuery.each( jQuery.macros.to, function(i,n){
jQuery.fn[ i ] = function(){
var a = arguments;
return this.each(function(){
for ( var j = 0; j < a.length; j++ )
- $(a[j])[n]( this );
+ jQuery(a[j])[n]( this );
});
};
});
-
+
jQuery.each( jQuery.macros.each, function(i,n){
jQuery.fn[ i ] = function() {
return this.each( n, arguments );
@@ -852,7 +1161,7 @@ jQuery.extend({
return this.filter( ":" + n + "(" + num + ")", fn );
};
});
-
+
jQuery.each( jQuery.macros.attr, function(i,n){
n = n || i;
jQuery.fn[ i ] = function(h) {
@@ -861,7 +1170,7 @@ jQuery.extend({
this.attr( n, h );
};
});
-
+
jQuery.each( jQuery.macros.css, function(i,n){
jQuery.fn[ n ] = function(h) {
return h == undefined ?
@@ -869,38 +1178,60 @@ jQuery.extend({
this.css( n, h );
};
});
-
+
},
-
+
/**
* A generic iterator function, which can be used to seemlessly
- * iterate over both objects and arrays.
+ * iterate over both objects and arrays. This function is not the same
+ * as $().each() - which is used to iterate, exclusively, over a jQuery
+ * object. This function can be used to iterate over anything.
+ *
+ * @example $.each( [0,1,2], function(i){
+ * alert( "Item #" + i + ": " + this );
+ * });
+ * @desc This is an example of iterating over the items in an array, accessing both the current item and its index.
*
- * @name jQuery.each
+ * @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
*/
+ // 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;
},
-
+
className: {
add: function(o,c){
if (jQuery.className.has(o,c)) return;
o.className += ( o.className ? " " : "" ) + c;
},
remove: function(o,c){
- o.className = !c ? "" :
- o.className.replace(
- new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");
+ if( !c ) {
+ o.className = "";
+ } else {
+ var classes = o.className.split(" ");
+ for(var i=0; i" + a[i] + "";
- } else if ( !a[i].indexOf("
" + a[i] + "";
- } else if ( !a[i].indexOf("
" + a[i] + "
";
- }
-
- 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;
+ 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]);
+ }
}
-
- 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()) );
+
+ 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;
},
-
+
+ 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;
+ }
+ },
+
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])",
"@": {
"=": "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"
},
-
+
+ /**
+ * 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 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( "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 jQuery.find
+ * @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;
-
- while ( t.length > 0 && last != t ) {
+
+ // Initialize the search
+ var ret = [context], done = [], last = null;
+
+ // Continue while a selector expression exists, and while
+ // we're no longer looping upon ourselves
+ while ( t && last != t ) {
var r = [];
last = t;
-
+
t = jQuery.trim(t).replace( /^\/\//i, "" );
-
+
var foundToken = false;
-
- for ( var i = 0; i < jQuery.token.length; i += 2 ) {
- 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);
-
- 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, "" );
+
+ // Re-organize the results, so that they're consistent
+ if ( m ) {
+ m = [ 0, m[2], m[3], m[1] ];
+
} else {
- if ( !m[2] || m[1] == "." ) m[2] = "*";
-
+ // 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 ];
+
+ } else {
+ // 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, 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;
- 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 );
+ if ( add )
+ r.push( s );
+
+ if ( token == "#" && r.length ) break;
+
+ if ( s.firstChild )
+ jQuery.getAll( s, r, token, name, re );
}
+
return r;
},
-
- attr: function(o,a,v){
- if ( a && a.constructor == String ) {
- var fix = {
- "for": "htmlFor",
- "class": "className",
- "float": "cssFloat"
- };
-
- a = (fix[a] && fix[a].replace && fix[a] || a)
- .replace(/-([a-z])/ig,function(z,b){
- return b.toUpperCase();
- });
-
- if ( v != undefined ) {
- o[a] = v;
- if ( o.setAttribute && a != "disabled" )
- o.setAttribute(a,v);
- }
-
- return o[a] || o.getAttribute && o.getAttribute(a) || "";
- } else
- return "";
+
+ attr: function(elem, name, value){
+ var fix = {
+ "for": "htmlFor",
+ "class": "className",
+ "float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
+ cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+ innerHTML: "innerHTML",
+ className: "className",
+ value: "value",
+ disabled: "disabled",
+ 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
+ // 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 ( 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 );
+
+ } else {
+ name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
+ if ( value != undefined ) elem[name] = value;
+ return elem[name];
+ }
},
// 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) {
- // 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++ ) {
- 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, "" );
@@ -1325,52 +1794,65 @@ jQuery.extend({
break;
}
}
-
- // :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]);" : "" ) +
+ eval("f = function(a,i){" +
+ ( m[1] == "@" ? "z=jQuery.attr(a,m[3]);" : "" ) +
"return " + f + "}");
-
+
// Execute it against the current filter
- r = g( r, f );
+ r = jQuery.grep( r, f, not );
}
}
-
+
// Return an array of filtered elements (r)
// and the modified expression string (t)
return { r: r, t: t };
},
-
+
/**
* Remove the whitespace from the beginning and end of a string.
*
- * @private
- * @name jQuery.trim
+ * @example $.trim(" hello, how are you? ");
+ * @result "hello, how are you?"
+ *
+ * @name $.trim
* @type String
* @param String str The string to trim.
+ * @cat Javascript
*/
trim: function(t){
return t.replace(/^\s+|\s+$/g, "");
},
-
+
/**
* All ancestors of a given element.
*
* @private
- * @name jQuery.parents
+ * @name $.parents
* @type Array
* @param Element elem The element to find the ancestors of.
+ * @cat DOM/Traversing
*/
parents: function( elem ){
var matched = [];
@@ -1381,122 +1863,131 @@ jQuery.extend({
}
return matched;
},
-
- /**
- * All elements on a specified axis.
- *
- * @private
- * @name jQuery.sibling
- * @type Array
- * @param Element elem The element to find all the siblings of (including itself).
- */
- 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;
+ makeArray: function( a ) {
+ var r = [];
- if ( siblings[i].nodeType == 1 )
- elems.push( siblings[i] );
- if ( siblings[i] == elem )
- elems.n = elems.length - 1;
- }
+ if ( a.constructor != Array ) {
+ for ( var i = 0; i < a.length; i++ )
+ r.push( a[i] );
+ } else
+ r = a.slice( 0 );
- 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]
- });
+ return r;
},
-
+
+ inArray: function( b, a ) {
+ for ( var i = 0; i < a.length; i++ )
+ if ( a[i] == b )
+ return i;
+ return -1;
+ },
+
/**
- * 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.
*
- * @private
- * @name jQuery.merge
+ * @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) {
- var result = [];
-
- // 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
+ var r = [].slice.call( first, 0 );
+
+ // 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;
},
-
+
/**
- * 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).
- *
- * @private
- * @name jQuery.grep
+ * 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
* @param Array array The Array to find items in.
* @param Function fn The function to process each item against.
* @param Boolean inv Invert the selection - select the opposite of the function.
+ * @cat Javascript
*/
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 = [];
-
+
// Go through the array, only saving the items
// that pass the validator function
for ( var i = 0; i < elems.length; i++ )
if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
result.push( elems[i] );
-
+
return result;
},
-
+
/**
- * 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]
*
- * @private
- * @name jQuery.map
+ * @name $.map
* @type Array
* @param Array array The Array to translate.
* @param Function fn The function to process each item against.
+ * @cat Javascript
*/
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).
for ( var i = 0; i < elems.length; i++ ) {
@@ -1504,19 +1995,29 @@ 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;
},
-
+
/*
* A number of helper functions used for managing events.
* Many of the ideas behind this code orignated from Dean Edwards' addEvent library.
*/
event: {
-
+
// Bind an event to an element
// Original by Dean Edwards
add: function(element, type, handler) {
@@ -1524,23 +2025,23 @@ jQuery.extend({
// around, causing it to be cloned in the process
if ( jQuery.browser.msie && element.setInterval != undefined )
element = window;
-
+
// Make sure that the function being executed has a unique ID
if ( !handler.guid )
handler.guid = this.guid++;
-
+
// Init the element's event structure
if (!element.events)
element.events = {};
-
+
// Get the current list of functions bound to this event
var handlers = element.events[type];
-
+
// If it hasn't been initialized yet
if (!handlers) {
// Init the event handler queue
handlers = element.events[type] = {};
-
+
// Remember an existing handler, if it's already there
if (element["on" + type])
handlers[0] = element["on" + type];
@@ -1548,19 +2049,19 @@ jQuery.extend({
// Add the function to the element's handler list
handlers[handler.guid] = handler;
-
+
// And bind the global event handler to the element
element["on" + type] = this.handle;
-
+
// Remember the function in a global list (for triggering)
if (!this.global[type])
this.global[type] = [];
this.global[type].push( element );
},
-
+
guid: 1,
global: {},
-
+
// Detach an event or set of events from an element
remove: function(element, type, handler) {
if (element.events)
@@ -1574,68 +2075,123 @@ jQuery.extend({
for ( var j in element.events )
this.remove( element, j );
},
-
+
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 ) {
var g = this.global[type];
if ( g )
for ( var i = 0; i < g.length; i++ )
this.trigger( type, data, g[i] );
-
+
// Handle triggering a single element
} else if ( element["on" + type] ) {
// Pass along a fake event
data.unshift( this.fix({ type: type, target: element }) );
-
+
// Trigger the event
element["on" + type].apply( element, data );
}
},
-
+
handle: function(event) {
- if ( typeof jQuery == "undefined" ) return;
+ if ( typeof jQuery == "undefined" ) return false;
+
+ event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
- event = event || jQuery.event.fix( window.event );
-
- // If no correct event was found, fail
- if ( !event ) return;
-
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 ) {
+ // 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();
@@ -1644,7 +2200,7 @@ new function() {
safari: /webkit/.test(b),
opera: /opera/.test(b),
msie: /msie/.test(b) && !/opera/.test(b),
- mozilla: /mozilla/.test(b) && !/compatible/.test(b)
+ mozilla: /mozilla/.test(b) && !/(compatible|webkit)/.test(b)
};
// Check to see if the W3C box model is being used
@@ -1658,7 +2214,7 @@ jQuery.macros = {
* This operation is, essentially, the reverse of doing a regular
* $(A).append(B), in that instead of appending B to A, you're appending
* A to B.
- *
+ *
* @example $("p").appendTo("#foo");
* @before
I would like to say:
* @result
I would like to say:
@@ -1669,13 +2225,13 @@ jQuery.macros = {
* @cat DOM/Manipulation
*/
appendTo: "append",
-
+
/**
* Prepend all of the matched elements to another, specified, set of elements.
* This operation is, essentially, the reverse of doing a regular
* $(A).prepend(B), in that instead of prepending B to A, you're prepending
* A to B.
- *
+ *
* @example $("p").prependTo("#foo");
* @before
I would like to say:
Hello
* @result
I would like to say:
Hello
@@ -1686,13 +2242,13 @@ jQuery.macros = {
* @cat DOM/Manipulation
*/
prependTo: "prepend",
-
+
/**
* Insert all of the matched elements before another, specified, set of elements.
* This operation is, essentially, the reverse of doing a regular
* $(A).before(B), in that instead of inserting B before A, you're inserting
* A before B.
- *
+ *
* @example $("p").insertBefore("#foo");
* @before
Hello
I would like to say:
* @result
I would like to say:
Hello
@@ -1703,13 +2259,13 @@ jQuery.macros = {
* @cat DOM/Manipulation
*/
insertBefore: "before",
-
+
/**
* Insert all of the matched elements after another, specified, set of elements.
* This operation is, essentially, the reverse of doing a regular
* $(A).after(B), in that instead of inserting B after A, you're inserting
* A after B.
- *
+ *
* @example $("p").insertAfter("#foo");
* @before
I would like to say:
Hello
* @result
Hello
I would like to say:
@@ -1721,10 +2277,10 @@ jQuery.macros = {
*/
insertAfter: "after"
},
-
+
/**
* Get the current CSS width of the first matched element.
- *
+ *
* @example $("p").width();
* @before
This is just a test.
* @result "300px"
@@ -1733,12 +2289,12 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS width of every matched element. Be sure to include
- * the "px" (or other unit of measurement) after the number that you
+ * the "px" (or other unit of measurement) after the number that you
* specify, otherwise you might get strange results.
- *
+ *
* @example $("p").width("20px");
* @before
This is just a test.
* @result
This is just a test.
@@ -1748,10 +2304,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS height of the first matched element.
- *
+ *
* @example $("p").height();
* @before
This is just a test.
* @result "14px"
@@ -1760,12 +2316,12 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS height of every matched element. Be sure to include
- * the "px" (or other unit of measurement) after the number that you
+ * the "px" (or other unit of measurement) after the number that you
* specify, otherwise you might get strange results.
- *
+ *
* @example $("p").height("20px");
* @before
This is just a test.
* @result
This is just a test.
@@ -1775,10 +2331,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS top of the first matched element.
- *
+ *
* @example $("p").top();
* @before
This is just a test.
* @result "0px"
@@ -1787,12 +2343,12 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS top of every matched element. Be sure to include
- * the "px" (or other unit of measurement) after the number that you
+ * the "px" (or other unit of measurement) after the number that you
* specify, otherwise you might get strange results.
- *
+ *
* @example $("p").top("20px");
* @before
This is just a test.
* @result
This is just a test.
@@ -1802,10 +2358,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS left of the first matched element.
- *
+ *
* @example $("p").left();
* @before
This is just a test.
* @result "0px"
@@ -1814,12 +2370,12 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS left of every matched element. Be sure to include
- * the "px" (or other unit of measurement) after the number that you
+ * the "px" (or other unit of measurement) after the number that you
* specify, otherwise you might get strange results.
- *
+ *
* @example $("p").left("20px");
* @before
This is just a test.
* @result
This is just a test.
@@ -1829,10 +2385,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS position of the first matched element.
- *
+ *
* @example $("p").position();
* @before
This is just a test.
* @result "static"
@@ -1841,10 +2397,10 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS position of every matched element.
- *
+ *
* @example $("p").position("relative");
* @before
This is just a test.
* @result
This is just a test.
@@ -1854,10 +2410,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS float of the first matched element.
- *
+ *
* @example $("p").float();
* @before
This is just a test.
* @result "none"
@@ -1866,10 +2422,10 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS float of every matched element.
- *
+ *
* @example $("p").float("left");
* @before
This is just a test.
* @result
This is just a test.
@@ -1879,10 +2435,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS overflow of the first matched element.
- *
+ *
* @example $("p").overflow();
* @before
This is just a test.
* @result "none"
@@ -1891,10 +2447,10 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS overflow of every matched element.
- *
+ *
* @example $("p").overflow("auto");
* @before
This is just a test.
* @result
This is just a test.
@@ -1904,10 +2460,10 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS color of the first matched element.
- *
+ *
* @example $("p").color();
* @before
This is just a test.
* @result "black"
@@ -1916,10 +2472,10 @@ jQuery.macros = {
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS color of every matched element.
- *
+ *
* @example $("p").color("blue");
* @before
This is just a test.
* @result
This is just a test.
@@ -1929,22 +2485,22 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
/**
* Get the current CSS background of the first matched element.
- *
+ *
* @example $("p").background();
- * @before
This is just a test.
- * @result ""
+ * @before
This is just a test.
+ * @result "blue"
*
* @name background
* @type String
* @cat CSS
*/
-
+
/**
* Set the CSS background of every matched element.
- *
+ *
* @example $("p").background("blue");
* @before
This is just a test.
* @result
This is just a test.
@@ -1954,15 +2510,73 @@ jQuery.macros = {
* @param String val Set the CSS property to the specified value.
* @cat CSS
*/
-
+
css: "width,height,top,left,position,float,overflow,color,background".split(","),
+ /**
+ * Reduce the set of matched elements to a single element.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").eq(1)
+ * @before
This is just a test.
So is this
+ * @result [
So is this
]
+ *
+ * @name eq
+ * @type jQuery
+ * @param Number pos The index of the element that you wish to limit to.
+ * @cat Core
+ */
+
+ /**
+ * Reduce the set of matched elements to all elements before a given position.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").lt(1)
+ * @before
This is just a test.
So is this
+ * @result [
This is just a test.
]
+ *
+ * @name lt
+ * @type jQuery
+ * @param Number pos Reduce the set to all elements below this position.
+ * @cat Core
+ */
+
+ /**
+ * Reduce the set of matched elements to all elements after a given position.
+ * The position of the element in the set of matched elements
+ * starts at 0 and goes to length - 1.
+ *
+ * @example $("p").gt(0)
+ * @before
This is just a test.
So is this
+ * @result [
So is this
]
+ *
+ * @name gt
+ * @type jQuery
+ * @param Number pos Reduce the set to all elements after this position.
+ * @cat Core
+ */
+
+ /**
+ * Filter the set of elements to those that contain the specified text.
+ *
+ * @example $("p").contains("test")
+ * @before
This is just a test.
So is this
+ * @result [
This is just a test.
]
+ *
+ * @name contains
+ * @type jQuery
+ * @param String str The string that will be contained within the text of an element.
+ * @cat DOM/Traversing
+ */
+
filter: [ "eq", "lt", "gt", "contains" ],
attr: {
/**
* Get the current value of the first matched element.
- *
+ *
* @example $("input").val();
* @before
* @result "some text"
@@ -1971,11 +2585,11 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the value of every matched element.
- *
- * @example $("input").value("test");
+ *
+ * @example $("input").val("test");
* @before
* @result
*
@@ -1985,10 +2599,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
val: "value",
-
+
/**
* Get the html contents of the first matched element.
- *
+ *
* @example $("div").html();
* @before
* @result
@@ -1997,32 +2611,24 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the html contents of every matched element.
- *
+ *
* @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.
* @cat DOM/Attributes
*/
html: "innerHTML",
-
+
/**
* Get the current id of the first matched element.
- *
+ *
* @example $("input").id();
* @before
* @result "test"
@@ -2031,10 +2637,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the id of every matched element.
- *
+ *
* @example $("input").id("newid");
* @before
* @result
@@ -2045,10 +2651,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
id: null,
-
+
/**
* Get the current title of the first matched element.
- *
+ *
* @example $("img").title();
* @before
* @result "my image"
@@ -2057,10 +2663,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the title of every matched element.
- *
+ *
* @example $("img").title("new title");
* @before
* @result
@@ -2071,10 +2677,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
title: null,
-
+
/**
* Get the current name of the first matched element.
- *
+ *
* @example $("input").name();
* @before
* @result "username"
@@ -2083,10 +2689,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the name of every matched element.
- *
+ *
* @example $("input").name("user");
* @before
* @result
@@ -2097,10 +2703,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
name: null,
-
+
/**
* Get the current href of the first matched element.
- *
+ *
* @example $("a").href();
* @before my link
* @result "test.html"
@@ -2109,10 +2715,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the href of every matched element.
- *
+ *
* @example $("a").href("test2.html");
* @before my link
* @result my link
@@ -2123,10 +2729,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
href: null,
-
+
/**
* Get the current src of the first matched element.
- *
+ *
* @example $("img").src();
* @before
* @result "test.jpg"
@@ -2135,10 +2741,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the src of every matched element.
- *
+ *
* @example $("img").src("test2.jpg");
* @before
* @result
@@ -2149,10 +2755,10 @@ jQuery.macros = {
* @cat DOM/Attributes
*/
src: null,
-
+
/**
* Get the current rel of the first matched element.
- *
+ *
* @example $("a").rel();
* @before my link
* @result "nofollow"
@@ -2161,10 +2767,10 @@ jQuery.macros = {
* @type String
* @cat DOM/Attributes
*/
-
+
/**
* Set the rel of every matched element.
- *
+ *
* @example $("a").rel("nofollow");
* @before my link
* @result my link
@@ -2176,7 +2782,7 @@ jQuery.macros = {
*/
rel: null
},
-
+
axis: {
/**
* Get a set of elements containing the unique parents of the matched
@@ -2208,11 +2814,11 @@ jQuery.macros = {
/**
* Get a set of elements containing the unique ancestors of the matched
- * set of elements.
+ * set of elements (except for the root element).
*
* @example $("span").ancestors()
* @before
]
*
* @name ancestors
* @type jQuery
@@ -2233,14 +2839,14 @@ jQuery.macros = {
* @cat DOM/Traversing
*/
ancestors: jQuery.parents,
-
+
/**
* Get a set of elements containing the unique ancestors of the matched
- * set of elements.
+ * set of elements (except for the root element).
*
* @example $("span").ancestors()
* @before
]
*
* @name parents
* @type jQuery
@@ -2263,9 +2869,9 @@ jQuery.macros = {
parents: jQuery.parents,
/**
- * Get a set of elements containing the unique next siblings of each of the
+ * Get a set of elements containing the unique next siblings of each of the
* matched set of elements.
- *
+ *
* It only returns the very next sibling, not all next siblings.
*
* @example $("p").next()
@@ -2278,9 +2884,9 @@ jQuery.macros = {
*/
/**
- * Get a set of elements containing the unique next siblings of each of the
+ * Get a set of elements containing the unique next siblings of each of the
* matched set of elements, and filtered by an expression.
- *
+ *
* It only returns the very next sibling, not all next siblings.
*
* @example $("p").next(".selected")
@@ -2292,15 +2898,15 @@ 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
+ * Get a set of elements containing the unique previous siblings of each of the
* matched set of elements.
- *
+ *
* It only returns the immediately previous sibling, not all previous siblings.
*
- * @example $("p").previous()
+ * @example $("p").prev()
* @before
Hello
Hello Again
And Again
* @result [
Hello Again
]
*
@@ -2310,12 +2916,12 @@ jQuery.macros = {
*/
/**
- * Get a set of elements containing the unique previous siblings of each of the
+ * Get a set of elements containing the unique previous siblings of each of the
* matched set of elements, and filtered by an expression.
- *
+ *
* 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
]
*
@@ -2324,12 +2930,12 @@ 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
+ * Get a set of elements containing all of the unique siblings of each of the
* matched set of elements.
- *
+ *
* @example $("div").siblings()
* @before
Hello
Hello Again
And Again
* @result [
Hello
,
And Again
]
@@ -2340,7 +2946,7 @@ jQuery.macros = {
*/
/**
- * Get a set of elements containing all of the unique siblings of each of the
+ * Get a set of elements containing all of the unique siblings of each of the
* matched set of elements, and filtered by an expression.
*
* @example $("div").siblings(".selected")
@@ -2352,13 +2958,12 @@ jQuery.macros = {
* @param String expr An expression to filter the sibling Elements with
* @cat DOM/Traversing
*/
- siblings: jQuery.sibling,
-
-
+ siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
+
/**
- * Get a set of elements containing all of the unique children of each of the
+ * Get a set of elements containing all of the unique children of each of the
* matched set of elements.
- *
+ *
* @example $("div").children()
* @before
Hello
Hello Again
And Again
* @result [ Hello Again ]
@@ -2369,7 +2974,7 @@ jQuery.macros = {
*/
/**
- * Get a set of elements containing all of the unique children of each of the
+ * Get a set of elements containing all of the unique children of each of the
* matched set of elements, and filtered by an expression.
*
* @example $("div").children(".selected")
@@ -2381,33 +2986,40 @@ jQuery.macros = {
* @param String expr An expression to filter the child Elements with
* @cat DOM/Traversing
*/
- children: "a.childNodes"
+ children: "jQuery.sibling(a.firstChild)"
},
each: {
+ /**
+ * Remove an attribute from each of the matched elements.
+ *
+ * @example $("input").removeAttr("disabled")
+ * @before
+ * @result
+ *
+ * @name removeAttr
+ * @type jQuery
+ * @param String name The name of the attribute to remove.
+ * @cat DOM
+ */
removeAttr: function( key ) {
+ jQuery.attr( this, key, "" );
this.removeAttribute( key );
},
/**
* Displays each of the set of matched elements if they are hidden.
- *
+ *
* @example $("p").show()
* @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
*/
- _show: function(){
+ show: function(){
this.style.display = this.oldblock ? this.oldblock : "";
if ( jQuery.css(this,"display") == "none" )
this.style.display = "block";
@@ -2430,13 +3042,13 @@ jQuery.macros = {
* @type jQuery
* @cat Effects
*/
- _hide: function(){
+ hide: function(){
this.oldblock = this.oldblock || jQuery.css(this,"display");
if ( this.oldblock == "none" )
this.oldblock = "block";
this.style.display = "none";
},
-
+
/**
* Toggles each of the set of matched elements. If they are shown,
* toggle makes them hidden. If they are hidden, toggle
@@ -2450,11 +3062,10 @@ jQuery.macros = {
* @type jQuery
* @cat Effects
*/
- _toggle: function(){
- var d = jQuery.css(this,"display");
- $(this)[ !d || d == "none" ? "show" : "hide" ]();
+ toggle: function(){
+ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
},
-
+
/**
* Adds the specified class to each of the set of matched elements.
*
@@ -2462,14 +3073,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
@@ -2478,7 +3081,7 @@ jQuery.macros = {
addClass: function(c){
jQuery.className.add(this,c);
},
-
+
/**
* Removes the specified class from the set of matched elements.
*
@@ -2486,14 +3089,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
@@ -2502,10 +3097,10 @@ jQuery.macros = {
removeClass: function(c){
jQuery.className.remove(this,c);
},
-
+
/**
- * Adds the specified class if it is present, removes it if it is
- * not present.
+ * Adds the specified class if it is not present, removes it if it is
+ * present.
*
* @example $("p").toggleClass("selected")
* @before
Hello
Hello Again
@@ -2517,9 +3112,9 @@ jQuery.macros = {
* @cat DOM
*/
toggleClass: function( c ){
- jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this,c);
+ jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
},
-
+
/**
* Removes all matched elements from the DOM. This does NOT remove them from the
* jQuery object, allowing you to use the matched elements further.
@@ -2532,7 +3127,7 @@ jQuery.macros = {
* @type jQuery
* @cat DOM/Manipulation
*/
-
+
/**
* Removes only elements (out of the list of matched elements) that match
* the specified jQuery expression. This does NOT remove them from the
@@ -2548,10 +3143,10 @@ jQuery.macros = {
* @cat DOM/Manipulation
*/
remove: function(a){
- if ( !a || jQuery.filter( [this], a ).r )
+ if ( !a || jQuery.filter( a, [this] ).r )
this.parentNode.removeChild( this );
},
-
+
/**
* Removes all child nodes from the set of matched elements.
*
@@ -2567,26 +3162,33 @@ jQuery.macros = {
while ( this.firstChild )
this.removeChild( this.firstChild );
},
-
+
/**
- * Binds a particular event (like click) to a each of a set of match elements.
- *
- * @example $("p").bind( "click", function() { alert("Hello"); } )
+ * Binds a handler to a particular event (like click) for each matched element.
+ * The event handler is passed an event object that you can use to prevent
+ * default behaviour. To stop both default action and event bubbling, your handler
+ * has to return false.
+ *
+ * @example $("p").bind( "click", function() {
+ * alert( $(this).text() );
+ * } )
* @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
@@ -2595,14 +3197,12 @@ jQuery.macros = {
* @cat Events
*/
bind: function( type, fn ) {
- if ( fn.constructor == String )
- fn = new Function("e", ( !fn.indexOf(".") ? "$(this)" : "return " ) + fn);
jQuery.event.add( this, type, fn );
},
-
+
/**
* The opposite of bind, removes a bound event from each of the matched
- * elements. You must pass the identical function that was used in the original
+ * elements. You must pass the identical function that was used in the original
* bind method.
*
* @example $("p").unbind( "click", function() { alert("Hello"); } )
@@ -2615,7 +3215,7 @@ jQuery.macros = {
* @param Function fn A function to unbind from the event on each of the set of matched elements
* @cat Events
*/
-
+
/**
* Removes all bound events of a particular type from each of the matched
* elements.
@@ -2629,7 +3229,7 @@ jQuery.macros = {
* @param String type An event type
* @cat Events
*/
-
+
/**
* Removes all bound events from each of the matched elements.
*
@@ -2644,7 +3244,7 @@ jQuery.macros = {
unbind: function( type, fn ) {
jQuery.event.remove( this, type, fn );
},
-
+
/**
* Trigger a type of event on every matched element.
*
@@ -2662,3 +3262,5 @@ jQuery.macros = {
}
}
};
+
+jQuery.init();