X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjquery%2Fjquery.js;h=8988c5ee107617620e249b4cd36e04cb914b08ee;hb=042a46386a4e5efe787f963245aa534663559838;hp=ebf98288d97501b8d9545b85daba30a7b2cb3e90;hpb=ca438a718a27eedc25572cafb3fb22780cf9fbb7;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index ebf9828..8988c5e 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,7 +1,7 @@
/*
* jQuery @VERSION - New Wave Javascript
*
- * Copyright (c) 2006 John Resig (jquery.com)
+ * Copyright (c) 2007 John Resig (jquery.com)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
@@ -9,59 +9,37 @@
* $Rev$
*/
-// Global undefined variable
-window.undefined = window.undefined;
-
/**
* Create a new jQuery Object
*
* @constructor
* @private
* @name jQuery
+ * @param String|Function|Element|Array|jQuery a selector
+ * @param jQuery|Element|Array c context
* @cat Core
*/
-var jQuery = function(a,c) {
- // Make sure that a selection was provided
- a = a || document;
-
- // Shortcut for document ready
- // Safari reports typeof on DOM NodeLists as a function
- if ( typeof a == "function" && !a.nodeType && a[0] == undefined )
- return jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
- // Watch for when a jQuery object is passed as the selector
- if ( a.jquery )
- return jQuery( jQuery.makeArray( a ) );
-
- // Watch for when a jQuery object is passed at the context
- if ( c && c.jquery )
- return jQuery( c ).find(a);
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+ var _jQuery = jQuery;
+var jQuery = window.jQuery = function(a,c) {
// If the context is global, return a new object
- if ( window == this )
+ if ( window == this || !this.init )
return new jQuery(a,c);
-
- // Handle HTML strings
- if ( typeof a == "string" ) {
- var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
- if ( m ) a = jQuery.clean( [ m[1] ] );
- }
-
- // Watch for when an array is passed in
- return this.setArray( 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.makeArray( a ) :
-
- // Find the matching elements and save them for later
- jQuery.find( a, c ) );
+
+ return this.init(a,c);
};
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
- jQuery._$ = $;
+ var _$ = $;
// Map the jQuery namespace to the '$' one
-var $ = jQuery;
+window.$ = jQuery;
+
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
/**
* This function accepts a string containing a CSS or
@@ -73,11 +51,15 @@ var $ = jQuery;
* (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.
+ * By default, if no context is specified, $() looks for DOM elements within the context of the
+ * current HTML document. If you do specify a context, such as a DOM
+ * element or jQuery object, the expression will be matched against
+ * the contents of that context.
+ *
+ * See [[DOM/Traversing/Selectors]] for the allowed CSS/XPath syntax for expressions.
*
* @example $("div > p")
- * @desc This finds all p elements that are children of a div element.
+ * @desc Finds all p elements that are children of a div element.
* @before
one
two
three
* @result [
two
]
*
@@ -89,7 +71,7 @@ var $ = jQuery;
*
* @name $
* @param String expr An expression to search with
- * @param Element context (optional) A DOM Element, or Document, representing the base context.
+ * @param Element|jQuery context (optional) A DOM Element, Document or jQuery to use as context
* @cat Core
* @type jQuery
* @see $(Element)
@@ -97,50 +79,35 @@ var $ = jQuery;
*/
/**
- * This function accepts a string of raw HTML.
+ * Create DOM elements on-the-fly from the provided 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")
+ * @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.
+ * and appends it to the body element. Internally, an
+ * element is created and its 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
+ * @see appendTo(String)
*/
/**
- * Wrap jQuery functionality around a specific DOM Element.
+ * Wrap jQuery functionality around a single or multiple DOM Element(s).
+ *
* 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" );
+ * @example $(document.body).css( "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.
+ * @param Element|Array elems DOM element(s) to be encapsulated by a jQuery object.
* @cat Core
* @type jQuery
*/
@@ -149,8 +116,10 @@ var $ = 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.
+ * other $() operations on your page that depend on the DOM being ready to be
+ * operated on. 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.
@@ -160,29 +129,81 @@ var $ = jQuery;
* });
* @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).
+ * @example jQuery(function($) {
+ * // Your code using failsafe $ alias here...
+ * });
+ * @desc Uses both the shortcut for $(document).ready() and the argument
+ * to write failsafe jQuery code using the $ alias, without relying on the
+ * global alias.
*
* @name $
- * @param jQuery obj The jQuery object to be cloned.
+ * @param Function fn The function to execute when the DOM is ready.
* @cat Core
* @type jQuery
+ * @see ready(Function)
*/
jQuery.fn = jQuery.prototype = {
/**
+ * Initialize a new jQuery object
+ *
+ * @private
+ * @name init
+ * @param String|Function|Element|Array|jQuery a selector
+ * @param jQuery|Element|Array c context
+ * @cat Core
+ */
+ init: function(a,c) {
+ // Make sure that a selection was provided
+ a = a || document;
+
+ // Handle HTML strings
+ if ( typeof a == "string" ) {
+ var m = quickExpr.exec(a);
+ if ( m && (m[1] || !c) ) {
+ // HANDLE: $(html) -> $(array)
+ if ( m[1] )
+ a = jQuery.clean( [ m[1] ] );
+
+ // HANDLE: $("#id")
+ else {
+ var tmp = document.getElementById( m[3] );
+ if ( tmp )
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( tmp.id != m[3] )
+ return jQuery().find( a );
+ else {
+ this[0] = tmp;
+ this.length = 1;
+ return this;
+ }
+ else
+ a = [];
+ }
+
+ // HANDLE: $(expr)
+ } else
+ return new jQuery( c ).find( a );
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction(a) )
+ return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+
+ return this.setArray(
+ // HANDLE: $(array)
+ a.constructor == Array && a ||
+
+ // HANDLE: $(arraylike)
+ // Watch for when an array-like object is passed as the selector
+ (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+
+ // HANDLE: $(*)
+ [ a ] );
+ },
+
+ /**
* The current version of jQuery.
*
* @private
@@ -194,7 +215,7 @@ jQuery.fn = jQuery.prototype = {
jquery: "@VERSION",
/**
- * The number of elements currently matched.
+ * The number of elements currently matched. The size function will return the same value.
*
* @example $("img").length;
* @before
@@ -207,7 +228,8 @@ jQuery.fn = jQuery.prototype = {
*/
/**
- * The number of elements currently matched.
+ * Get the number of elements currently matched. This returns the same
+ * number as the 'length' property of the jQuery object.
*
* @example $("img").size();
* @before
@@ -224,13 +246,16 @@ jQuery.fn = jQuery.prototype = {
length: 0,
/**
- * Access all matched elements. This serves as a backwards-compatible
+ * Access all matched DOM elements. This serves as a backwards-compatible
* way of accessing all matched elements (other than the jQuery object
* itself, which is, in fact, an array of elements).
*
+ * It is useful if you need to operate on the DOM elements themselves instead of using built-in jQuery functions.
+ *
* @example $("img").get();
* @before
* @result [ ]
+ * @desc Selects all images in the document and returns the DOM Elements as an Array
*
* @name get
* @type Array
@@ -238,12 +263,14 @@ jQuery.fn = jQuery.prototype = {
*/
/**
- * Access a single matched element. num is used to access the
- * Nth element matched.
+ * Access a single matched DOM element at a specified index in the matched set.
+ * This allows you to extract the actual DOM element and operate on it
+ * directly without necessarily using jQuery functionality on it.
*
- * @example $("img").get(1);
+ * @example $("img").get(0);
* @before
- * @result [ ]
+ * @result
+ * @desc Selects all images in the document and returns the first one
*
* @name get
* @type Element
@@ -264,24 +291,24 @@ jQuery.fn = jQuery.prototype = {
* Set the jQuery object to an array of elements, while maintaining
* the stack.
*
- * @example $("img").set([ document.body ]);
- * @result $("img").set() == [ document.body ]
+ * @example $("img").pushStack([ document.body ]);
+ * @result $("img").pushStack() == [ document.body ]
*
* @private
- * @name set
+ * @name pushStack
* @type jQuery
* @param Elements elems An array of elements
* @cat Core
*/
- set: function( a ) {
- var ret = jQuery(this);
+ pushStack: function( a ) {
+ var ret = jQuery(a);
ret.prevObject = this;
- return ret.setArray( a );
+ return ret;
},
/**
* Set the jQuery object to an array of elements. This operation is
- * completely destructive - be sure to use .set() if you wish to maintain
+ * completely destructive - be sure to use .pushStack() if you wish to maintain
* the jQuery stack.
*
* @example $("img").setArray([ document.body ]);
@@ -295,7 +322,7 @@ jQuery.fn = jQuery.prototype = {
*/
setArray: function( a ) {
this.length = 0;
- [].push.apply( this, a );
+ Array.prototype.push.apply( this, a );
return this;
},
@@ -303,17 +330,17 @@ jQuery.fn = jQuery.prototype = {
* Execute a function within the context of every matched element.
* This means that every time the passed-in function is executed
* (which is once for every element matched) the 'this' keyword
- * points to the specific element.
+ * points to the specific DOM element.
*
* Additionally, the function, when executed, is passed a single
* argument representing the position of the element in the matched
- * set.
+ * set (integer, zero-index).
*
* @example $("img").each(function(i){
* this.src = "test" + i + ".jpg";
* });
- * @before
- * @result
+ * @before
+ * @result
* @desc Iterates over two images and sets their src property
*
* @name each
@@ -330,21 +357,24 @@ jQuery.fn = jQuery.prototype = {
* the index of the element, if found, starting with zero.
* Returns -1 if the object wasn't found.
*
- * @example $("*").index(document.getElementById('foobar'))
- * @before
+ * @example $("*").index( $('#foobar')[0] )
+ * @before
* @result 0
+ * @desc Returns the index for the element with ID foobar
*
- * @example $("*").index(document.getElementById('foo'))
- * @before
+ * @example $("*").index( $('#foo')[0] )
+ * @before
* @result 2
+ * @desc Returns the index for the element with ID foo within another element
*
- * @example $("*").index(document.getElementById('bar'))
- * @before
+ * @example $("*").index( $('#bar')[0] )
+ * @before
* @result -1
+ * @desc Returns -1, as there is no element with ID bar
*
* @name index
* @type Number
- * @param Object obj Object to search for
+ * @param Element subject Object to search for
* @cat Core
*/
index: function( obj ) {
@@ -360,71 +390,101 @@ jQuery.fn = jQuery.prototype = {
* This method makes it easy to retrieve a property value
* from the first matched element.
*
+ * If the element does not have an attribute with such a
+ * name, undefined is returned.
+ *
* @example $("img").attr("src");
* @before
* @result test.jpg
+ * @desc Returns the src attribute from the first image in the document.
*
* @name attr
* @type Object
* @param String name The name of the property to access.
- * @cat DOM
+ * @cat DOM/Attributes
*/
/**
- * Set a hash of key/value object properties to all matched elements.
+ * Set a key/value object as properties to all matched elements.
+ *
* This serves as the best way to set a large number of properties
* on all matched elements.
*
* @example $("img").attr({ src: "test.jpg", alt: "Test Image" });
* @before
* @result
+ * @desc Sets src and alt attributes to all images.
*
* @name attr
* @type jQuery
- * @param Hash prop A set of key/value pairs to set as object properties.
- * @cat DOM
+ * @param Map properties Key/value pairs to set as object properties.
+ * @cat DOM/Attributes
*/
/**
* 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
+ * 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
+ * @desc Sets src attribute to all images.
*
* @name attr
* @type jQuery
* @param String key The name of the property to set.
* @param Object value The value to set the property to.
- * @cat DOM
+ * @cat DOM/Attributes
+ */
+
+ /**
+ * Set a single property to a computed value, on all matched elements.
+ *
+ * Instead of supplying a string value as described
+ * [[DOM/Attributes#attr.28_key.2C_value_.29|above]],
+ * a function is provided that computes the value.
+ *
+ * @example $("img").attr("title", function() { return this.src });
+ * @before
+ * @result
+ * @desc Sets title attribute from src attribute.
+ *
+ * @example $("img").attr("title", function(index) { return this.title + (i + 1); });
+ * @before
+ * @result
+ * @desc Enumerate title attribute.
+ *
+ * @name attr
+ * @type jQuery
+ * @param String key The name of the property to set.
+ * @param Function value A function returning the value to set.
+ * Scope: Current element, argument: Index of current element
+ * @cat DOM/Attributes
*/
attr: function( key, value, type ) {
+ var obj = key;
+
+ // Look for the case where we're accessing a style value
+ if ( key.constructor == String )
+ if ( value == undefined )
+ return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+ else {
+ obj = {};
+ obj[ key ] = value;
+ }
+
// Check to see if we're setting style values
- return typeof key != "string" || value != undefined ?
- this.each(function(){
- // See if we're setting a hash of styles
- if ( value == undefined )
- // Set all the styles
- for ( var prop in key )
- jQuery.attr(
- type ? this.style : this,
- prop, key[prop]
- );
-
- // See if we're setting a single key/value style
- else
- jQuery.attr(
- type ? this.style : this,
- key, value
- );
- }) :
-
- // Look for the case where we're accessing a style value
- jQuery[ type || "attr" ]( this[0], key );
+ return this.each(function(index){
+ // Set all the styles
+ for ( var prop in obj )
+ jQuery.attr(
+ type ? this.style : this,
+ prop, jQuery.prop(this, obj[prop], type, index, prop)
+ );
+ });
},
/**
@@ -434,52 +494,55 @@ jQuery.fn = jQuery.prototype = {
*
* @example $("p").css("color");
* @before
Test Paragraph.
- * @result red
+ * @result "red"
* @desc Retrieves the color style of the first paragraph
*
- * @example $("p").css("fontWeight");
+ * @example $("p").css("font-weight");
* @before
Test Paragraph.
- * @result bold
+ * @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
+ * @type String
* @param String name The name of the property to access.
* @cat CSS
*/
/**
- * Set a hash of key/value style properties to all matched elements.
+ * Set a key/value object as style properties to all matched elements.
+ *
* This serves as the best way to set a large number of style properties
* on all matched elements.
*
* @example $("p").css({ color: "red", background: "blue" });
* @before
Test Paragraph.
* @result
Test Paragraph.
+ * @desc Sets color and background styles to all p elements.
*
* @name css
* @type jQuery
- * @param Hash prop A set of key/value pairs to set as style properties.
+ * @param Map properties Key/value pairs to set as style properties.
* @cat CSS
*/
/**
* Set a single style property to a value, on all matched elements.
+ * If a number is provided, it is automatically converted into a pixel value.
*
* @example $("p").css("color","red");
* @before
Test Paragraph.
* @result
Test Paragraph.
* @desc Changes the color of all paragraphs to red
*
+ * @example $("p").css("left",30);
+ * @before
Test Paragraph.
+ * @result
Test Paragraph.
+ * @desc Changes the left of all paragraphs to "30px"
+ *
* @name css
* @type jQuery
* @param String key The name of the property to set.
- * @param Object value The value to set the property to.
+ * @param String|Number value The value to set the property to.
* @cat CSS
*/
css: function( key, value ) {
@@ -487,48 +550,53 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Retrieve the text contents of all matched elements. The result is
+ * Get the text contents of all matched elements. The result is
* a string that contains the combined text contents of all matched
* elements. This method works on both HTML and XML documents.
*
* @example $("p").text();
- * @before
Test Paragraph.
- * @result Test Paragraph.
+ * @before
Test Paragraph.
Paraparagraph
+ * @result Test Paragraph.Paraparagraph
+ * @desc Gets the concatenated text of all paragraphs
*
* @name text
* @type String
- * @cat DOM
+ * @cat DOM/Attributes
*/
/**
- * Set the text contents of all matched elements. This has the same
- * effect as calling .html() with your specified string.
+ * Set the text contents of all matched elements.
*
- * @example $("p").text("Some new text.");
+ * Similar to html(), but escapes HTML (replace "<" and ">" with their
+ * HTML entities).
+ *
+ * @example $("p").text("Some new text.");
* @before
Test Paragraph.
- * @result
Some new text.
+ * @result
<b>Some</b> new text.
+ * @desc Sets the text of all paragraphs.
*
- * @param String val The text value to set the contents of the element to.
+ * @example $("p").text("Some new text.", true);
+ * @before
Test Paragraph.
+ * @result
Some new text.
+ * @desc Sets the text of all paragraphs.
*
* @name text
* @type String
- * @cat DOM
+ * @param String val The text value to set the contents of the element to.
+ * @cat DOM/Attributes
*/
text: function(e) {
- // A surprisingly high number of people expect the
- // .text() method to do this, so lets do it!
- if ( typeof e == "string" )
- return this.html( e );
+ if ( typeof e != "object" && e != null )
+ return this.empty().append( document.createTextNode( e ) );
- e = e || this;
var t = "";
- for ( var j = 0, el = e.length; j < el; j++ ) {
- var r = e[j].childNodes;
- for ( var i = 0, rl = r.length; i < rl; i++ )
- if ( r[i].nodeType != 8 )
- t += r[i].nodeType != 1 ?
- r[i].nodeValue : jQuery.fn.text([ r[i] ]);
- }
+ jQuery.each( e || this, function(){
+ jQuery.each( this.childNodes, function(){
+ if ( this.nodeType != 8 )
+ t += this.nodeType != 1 ?
+ this.nodeValue : jQuery.fn.text([ this ]);
+ });
+ });
return t;
},
@@ -575,15 +643,18 @@ jQuery.fn = jQuery.prototype = {
*
* @name wrap
* @type jQuery
- * @param Element elem A DOM element that will be wrapped.
+ * @param Element elem A DOM element that will be wrapped around the target.
* @cat DOM/Manipulation
*/
wrap: function() {
// The elements to wrap the target around
- var a = jQuery.clean(arguments);
+ var a, args = arguments;
// Wrap each of the matched elements individually
return this.each(function(){
+ if ( !a )
+ a = jQuery.clean(args, this.ownerDocument);
+
// Clone the structure that we're using to wrap
var b = a[0].cloneNode(true);
@@ -608,14 +679,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").append("Hello");
* @before
I would like to say:
* @result
I would like to say: Hello
+ * @desc Appends some HTML to all paragraphs.
*
* @example $("p").append( $("#foo")[0] );
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
+ * @desc Appends an Element to all paragraphs.
*
* @example $("p").append( $("b") );
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
+ * @desc Appends a jQuery object (similar to an Array of DOM Elements) to all paragraphs.
*
* @name append
* @type jQuery
@@ -640,14 +714,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").prepend("Hello");
* @before
I would like to say:
* @result
HelloI would like to say:
+ * @desc Prepends some HTML to all paragraphs.
*
* @example $("p").prepend( $("#foo")[0] );
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
+ * @desc Prepends an Element to all paragraphs.
*
* @example $("p").prepend( $("b") );
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
+ * @desc Prepends a jQuery object (similar to an Array of DOM Elements) to all paragraphs.
*
* @name prepend
* @type jQuery
@@ -669,14 +746,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").before("Hello");
* @before
I would like to say:
* @result Hello
I would like to say:
+ * @desc Inserts some HTML before all paragraphs.
*
* @example $("p").before( $("#foo")[0] );
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
+ * @desc Inserts an Element before all paragraphs.
*
* @example $("p").before( $("b") );
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
+ * @desc Inserts a jQuery object (similar to an Array of DOM Elements) before all paragraphs.
*
* @name before
* @type jQuery
@@ -698,14 +778,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").after("Hello");
* @before
I would like to say:
* @result
I would like to say:
Hello
+ * @desc Inserts some HTML after all paragraphs.
*
* @example $("p").after( $("#foo")[0] );
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
+ * @desc Inserts an Element after all paragraphs.
*
* @example $("p").after( $("b") );
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
+ * @desc Inserts a jQuery object (similar to an Array of DOM Elements) after all paragraphs.
*
* @name after
* @type jQuery
@@ -722,15 +805,22 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * 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
- * revert to the last state of matched elements.
+ * Revert the most recent 'destructive' operation, changing the set of matched elements
+ * to its previous state (right before the destructive operation).
*
* If there was no destructive operation before, an empty set is returned.
*
+ * A 'destructive' operation is any operation that changes the set of
+ * matched jQuery elements. These functions are: add,
+ * children, clone, filter,
+ * find, not, next,
+ * parent, parents, prev and siblings.
+ *
* @example $("p").find("span").end();
* @before
Hello, how are you?
- * @result $("p").find("span").end() == [
...
]
+ * @result [
...
]
+ * @desc Selects all paragraphs, finds span elements inside these, and reverts the
+ * selection back to the paragraphs.
*
* @name end
* @type jQuery
@@ -742,7 +832,8 @@ jQuery.fn = jQuery.prototype = {
/**
* Searches for all elements that match the specified expression.
- * This method is the optimal way of finding additional descendant
+ *
+ * This method is a good way to find additional descendant
* elements with which to process.
*
* All searching is done using a jQuery expression. The expression can be
@@ -750,7 +841,9 @@ jQuery.fn = jQuery.prototype = {
*
* @example $("p").find("span");
* @before
Hello, how are you?
- * @result $("p").find("span") == [ Hello ]
+ * @result [ Hello ]
+ * @desc Starts with all paragraphs and searches for descendant span
+ * elements, same as $("p span")
*
* @name find
* @type jQuery
@@ -758,47 +851,90 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Traversing
*/
find: function(t) {
- return this.set( jQuery.map( this, function(a){
- return jQuery.find(t,a);
- }) );
+ var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
+ return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
+ jQuery.unique( data ) : data );
},
/**
- * 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.
+ * Clone matched DOM Elements and select the clones.
+ *
* 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?
+ * @desc Clones all b elements (and selects the clones) and prepends them to all paragraphs.
*
* @name clone
* @type jQuery
+ * @param Boolean deep (Optional) Set to false if you don't want to clone all descendant nodes, in addition to the element itself.
* @cat DOM/Manipulation
*/
clone: function(deep) {
- return this.set( jQuery.map( this, function(a){
- return a.cloneNode( deep != undefined ? deep : true );
+ deep = deep != undefined ? deep : true;
+ var $this = this.add(this.find("*"));
+ if (jQuery.browser.msie) {
+ // Need to remove events on the element and its descendants
+ $this.each(function() {
+ this._$events = {};
+ for (var type in this.$events)
+ this._$events[type] = jQuery.extend({},this.$events[type]);
+ }).unbind();
+ }
+
+ // Do the clone
+ var r = this.pushStack( jQuery.map( this, function(a){
+ return a.cloneNode( deep );
}) );
+
+ if (jQuery.browser.msie) {
+ $this.each(function() {
+ // Add the events back to the original and its descendants
+ var events = this._$events;
+ for (var type in events)
+ for (var handler in events[type])
+ jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
+ this._$events = null;
+ });
+ }
+
+ // copy form values over
+ if (deep) {
+ var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
+ $this.filter('select,input[@type=checkbox]').each(function(i) {
+ if (this.selectedIndex)
+ inputs[i].selectedIndex = this.selectedIndex;
+ if (this.checked)
+ inputs[i].checked = true;
+ });
+ }
+
+ // Return the cloned set
+ return r;
},
/**
* Removes all elements from the set of matched elements that do not
- * match the specified expression. This method is used to narrow down
+ * match the specified expression(s). 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.
+ * Provide a comma-separated list of expressions to apply multiple filters at once.
*
* @example $("p").filter(".selected")
* @before
Hello
How are you?
* @result [
Hello
]
+ * @desc Selects all paragraphs and removes those without a class "selected".
+ *
+ * @example $("p").filter(".selected, :first")
+ * @before
Hello
Hello Again
And Again
+ * @result [
Hello
,
And Again
]
+ * @desc Selects all paragraphs and removes those without class "selected" and being the first one.
*
* @name filter
* @type jQuery
- * @param String expr An expression to search with.
+ * @param String expression Expression(s) to search with.
* @cat DOM/Traversing
*/
@@ -807,11 +943,8 @@ jQuery.fn = jQuery.prototype = {
* pass the specified filter. This method is used to narrow down
* the results of a search.
*
- * The elements to filter are passed as the first argument, their
- * index inside the set as the second.
- *
- * @example $("p").filter(function(element, index) {
- * return $("ol", element).length == 0;
+ * @example $("p").filter(function(index) {
+ * return $("ol", this).length == 0;
* })
* @before
Hello
How are you?
* @result [
How are you?
]
@@ -822,51 +955,24 @@ jQuery.fn = jQuery.prototype = {
* @param Function filter A function to use for filtering
* @cat DOM/Traversing
*/
-
- /**
- * Removes all elements from the set of matched elements that do not
- * match at least one of the expressions passed to the function. This
- * method is used when you want to filter the set of matched elements
- * through more than one expression.
- *
- * Elements will be retained in the jQuery object if they match at
- * least one of the expressions passed.
- *
- * @example $("p").filter([".selected", ":first"])
- * @before
Hello
Hello Again
And Again
- * @result [
Hello
,
And Again
]
- *
- * @name filter
- * @type jQuery
- * @param Array exprs A set of expressions to evaluate against
- * @cat DOM/Traversing
- */
filter: function(t) {
- return this.set(
- t.constructor == Array &&
- jQuery.map(this,function(a){
- for ( var i = 0, tl = t.length; i < tl; i++ )
- if ( jQuery.filter(t[i],[a]).r.length )
- return a;
- return null;
+ return this.pushStack(
+ jQuery.isFunction( t ) &&
+ jQuery.grep(this, function(el, index){
+ return t.apply(el, [index]);
}) ||
- t.constructor == Boolean &&
- ( t ? this.get() : [] ) ||
-
- typeof t == "function" &&
- jQuery.grep( this, t ) ||
-
- jQuery.filter(t,this).r );
+ jQuery.multiFilter(t,this) );
},
/**
* Removes the specified Element from the set of matched elements. This
* method is used to remove a single Element from a jQuery object.
*
- * @example $("p").not( document.getElementById("selected") )
+ * @example $("p").not( $("#selected")[0] )
* @before
Hello
Hello Again
* @result [
Hello
]
+ * @desc Removes the element with the ID "selected" from the set of all paragraphs.
*
* @name not
* @type jQuery
@@ -882,71 +988,112 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").not("#selected")
* @before
Hello
Hello Again
* @result [
Hello
]
+ * @desc Removes the element with the ID "selected" from the set of all paragraphs.
*
* @name not
* @type jQuery
* @param String expr An expression with which to remove matching elements
* @cat DOM/Traversing
*/
+
+ /**
+ * Removes any elements inside the array of elements from the set
+ * of matched elements. This method is used to remove one or more
+ * elements from a jQuery object.
+ *
+ * Please note: the expression cannot use a reference to the
+ * element name. See the two examples below.
+ *
+ * @example $("p").not( $("div p.selected") )
+ * @before
Hello
Hello Again
+ * @result [
Hello
]
+ * @desc Removes all elements that match "div p.selected" from the total set of all paragraphs.
+ *
+ * @name not
+ * @type jQuery
+ * @param jQuery elems A set of elements to remove from the jQuery set of matched elements.
+ * @cat DOM/Traversing
+ */
not: function(t) {
- return this.set( typeof t == "string" ?
- jQuery.filter(t,this,true).r :
- jQuery.grep(this,function(a){ return a != t; }) );
+ return this.pushStack(
+ t.constructor == String &&
+ jQuery.multiFilter(t, this, true) ||
+
+ jQuery.grep(this, function(a) {
+ return ( t.constructor == Array || t.jquery )
+ ? jQuery.inArray( a, t ) < 0
+ : a != t;
+ })
+ );
},
/**
- * Adds the elements matched by the expression to the jQuery object. This
- * can be used to concatenate the result sets of two expressions.
+ * Adds more elements, matched by the given expression,
+ * to the set of matched elements.
*
* @example $("p").add("span")
- * @before
, Hello Again ]
+ * @desc Compare the above result to the result of $('p'),
+ * which would just result in [
Hello
].
+ * Using add(), matched elements of $('span') are simply
+ * added to the returned jQuery-object.
*
* @name add
* @type jQuery
* @param String expr An expression whose matched elements are added
* @cat DOM/Traversing
*/
-
+
/**
- * Adds each of the Elements in the array to the set of matched elements.
- * This is used to add a set of Elements to a jQuery object.
+ * Adds more elements, created on the fly, to the set of
+ * matched elements.
*
- * @example $("p").add([document.getElementById("a"), document.getElementById("b")])
- * @before
Hello
Hello AgainAnd Again
- * @result [
Hello
, Hello Again, And Again ]
+ * @example $("p").add("Again")
+ * @before
Hello
+ * @result [
Hello
, Again ]
*
* @name add
* @type jQuery
- * @param Array els An array of Elements to add
+ * @param String html A string of HTML to create on the fly.
* @cat DOM/Traversing
*/
/**
- * Adds a single Element to the set of matched elements. This is used to
- * add a single Element to a jQuery object.
+ * Adds one or more Elements to the set of matched elements.
*
* @example $("p").add( document.getElementById("a") )
* @before
, , ]
+ *
* @name add
* @type jQuery
- * @param Element el An Element to add
+ * @param Element|Array elements One or more Elements to add
* @cat DOM/Traversing
*/
add: function(t) {
- return this.set( jQuery.merge(
- this.get(), typeof t == "string" ?
- jQuery.find(t) :
- t.constructor == Array ? t : [t] ) );
+ return this.pushStack( jQuery.merge(
+ this.get(),
+ t.constructor == String ?
+ jQuery(t).get() :
+ t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+ t : [t] )
+ );
},
/**
* Checks the current selection against an expression and returns true,
* if at least one element of the selection fits the given expression.
+ *
* Does return false, if no element fits or the expression is not valid.
*
+ * filter(String) is used internally, therefore all rules that apply there
+ * apply here, too.
+ *
* @example $("input[@type='checkbox']").parent().is("form")
* @before
* @result true
@@ -957,18 +1104,90 @@ jQuery.fn = jQuery.prototype = {
* @result false
* @desc Returns false, because the parent of the input is a p element
*
- * @example $("form").is(null)
- * @before
- * @result false
- * @desc An invalid expression always returns false.
- *
* @name is
* @type Boolean
* @param String expr The expression with which to filter
* @cat DOM/Traversing
*/
is: function(expr) {
- return expr ? jQuery.filter(expr,this).r.length > 0 : false;
+ return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
+ },
+
+ /**
+ * Get the content of the value attribute of the first matched element.
+ *
+ * Use caution when relying on this function to check the value of
+ * multiple-select elements and checkboxes in a form. While it will
+ * still work as intended, it may not accurately represent the value
+ * the server will receive because these elements may send an array
+ * of values. For more robust handling of field values, see the
+ * [http://www.malsup.com/jquery/form/#fields fieldValue function of the Form Plugin].
+ *
+ * @example $("input").val();
+ * @before
+ * @result "some text"
+ *
+ * @name val
+ * @type String
+ * @cat DOM/Attributes
+ */
+
+ /**
+ * Set the value attribute of every matched element.
+ *
+ * @example $("input").val("test");
+ * @before
+ * @result
+ *
+ * @name val
+ * @type jQuery
+ * @param String val Set the property to the specified value.
+ * @cat DOM/Attributes
+ */
+ val: function( val ) {
+ return val == undefined ?
+ ( this.length ? this[0].value : null ) :
+ this.attr( "value", val );
+ },
+
+ /**
+ * Get the html contents of the first matched element.
+ * This property is not available on XML documents.
+ *
+ * @example $("div").html();
+ * @before
+ * @result
+ *
+ * @name html
+ * @type String
+ * @cat DOM/Attributes
+ */
+
+ /**
+ * Set the html contents of every matched element.
+ * This property is not available on XML documents.
+ *
+ * @example $("div").html("new stuff");
+ * @before
+ * @result
new stuff
+ *
+ * @name html
+ * @type jQuery
+ * @param String val Set the html contents to the specified value.
+ * @cat DOM/Attributes
+ */
+ html: function( val ) {
+ return val == undefined ?
+ ( this.length ? this[0].innerHTML : null ) :
+ this.empty().append( val );
+ },
+
+ replaceWith: function( val ) {
+ return this.after( val ).remove();
+ },
+
+ slice: function() {
+ return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
},
/**
@@ -982,32 +1201,41 @@ jQuery.fn = jQuery.prototype = {
* @cat Core
*/
domManip: function(args, table, dir, fn){
- var clone = this.length > 1;
- var a = jQuery.clean(args);
- if ( dir < 0 )
- a.reverse();
+ var clone = this.length > 1, a;
return this.each(function(){
+ if ( !a ) {
+ a = jQuery.clean(args, this.ownerDocument);
+ if ( dir < 0 )
+ a.reverse();
+ }
+
var obj = this;
- if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+ if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
- for ( var i = 0, al = a.length; i < al; i++ )
- fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
-
+ jQuery.each( a, function(){
+ if ( jQuery.nodeName(this, "script") ) {
+ if ( this.src )
+ jQuery.ajax({ url: this.src, async: false, dataType: "script" });
+ else
+ jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
+ } else
+ fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+ });
});
}
};
/**
* Extends the jQuery object itself. Can be used to add functions into
- * the jQuery namespace and to add plugin methods (plugins).
+ * the jQuery namespace and to [[Plugins/Authoring|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; });
* }
@@ -1049,22 +1277,43 @@ jQuery.fn = jQuery.prototype = {
* @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
+ * @cat JavaScript
*/
jQuery.extend = jQuery.fn.extend = function() {
// copy reference to target object
- var target = arguments[0],
- a = 1;
+ var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+ // Handle a deep copy situation
+ if ( target.constructor == Boolean ) {
+ deep = target;
+ target = arguments[1] || {};
+ }
// extend jQuery itself if only one argument is passed
- if ( arguments.length == 1 ) {
+ if ( al == 1 ) {
target = this;
a = 0;
}
+
var prop;
- while (prop = arguments[a++])
- // Extend the base object
- for ( var i in prop ) target[i] = prop[i];
+
+ for ( ; a < al; a++ )
+ // Only deal with non-null/undefined values
+ if ( (prop = arguments[a]) != null )
+ // Extend the base object
+ for ( var i in prop ) {
+ // Prevent never-ending loop
+ if ( target == prop[i] )
+ continue;
+
+ // Recurse if we're merging object values
+ if ( deep && typeof prop[i] == 'object' && target[i] )
+ jQuery.extend( target[i], prop[i] );
+
+ // Don't bring in undefined values
+ else if ( prop[i] != undefined )
+ target[i] = prop[i];
+ }
// Return the modified object
return target;
@@ -1072,112 +1321,163 @@ jQuery.extend = jQuery.fn.extend = function() {
jQuery.extend({
/**
- * @private
- * @name init
+ * Run this function to give control of the $ variable back
+ * to whichever library first implemented it. This helps to make
+ * sure that jQuery doesn't conflict with the $ object
+ * of other libraries.
+ *
+ * By using this function, you will only be able to access jQuery
+ * using the 'jQuery' variable. For example, where you used to do
+ * $("div p"), you now must do jQuery("div p").
+ *
+ * @example jQuery.noConflict();
+ * // Do something with jQuery
+ * jQuery("div p").hide();
+ * // Do something with another library's $()
+ * $("content").style.display = 'none';
+ * @desc Maps the original object that was referenced by $ back to $
+ *
+ * @example jQuery.noConflict();
+ * (function($) {
+ * $(function() {
+ * // more code using $ as alias to jQuery
+ * });
+ * })(jQuery);
+ * // other code using $ as an alias to the other library
+ * @desc Reverts the $ alias and then creates and executes a
+ * function to provide the $ as a jQuery alias inside the functions
+ * scope. Inside the function the original $ object is not available.
+ * This works well for most plugins that don't rely on any other library.
+ *
+ *
+ * @name $.noConflict
* @type undefined
- * @cat Core
+ * @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 && typeof a == "string" )
- ret = jQuery.filter(a,ret).r;
- return this.set( ret );
- };
- });
-
- jQuery.each( jQuery.macros.to, function(i,n){
- jQuery.fn[ i ] = function(){
- var a = arguments;
- return this.each(function(){
- for ( var j = 0, al = a.length; j < al; j++ )
- jQuery(a[j])[n]( this );
- });
- };
- });
-
- jQuery.each( jQuery.macros.each, function(i,n){
- jQuery.fn[ i ] = function() {
- return this.each( n, arguments );
- };
- });
-
- jQuery.each( jQuery.macros.filter, function(i,n){
- jQuery.fn[ n ] = function(num,fn) {
- return this.filter( ":" + n + "(" + num + ")", fn );
- };
- });
+ noConflict: function(deep) {
+ window.$ = _$;
+ if ( deep )
+ window.jQuery = _jQuery;
+ return jQuery;
+ },
- jQuery.each( jQuery.macros.attr, function(i,n){
- n = n || i;
- jQuery.fn[ i ] = function(h) {
- return h == undefined ?
- this.length ? this[0][n] : null :
- this.attr( n, h );
- };
- });
+ // This may seem like some crazy code, but trust me when I say that this
+ // is the only cross-browser way to do this. --John
+ isFunction: function( fn ) {
+ return !!fn && typeof fn != "string" && !fn.nodeName &&
+ fn.constructor != Array && /function/i.test( fn + "" );
+ },
+
+ // check if an element is in a XML document
+ isXMLDoc: function(elem) {
+ return elem.documentElement && !elem.body ||
+ elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+ },
- jQuery.each( jQuery.macros.css, function(i,n){
- jQuery.fn[ n ] = function(h) {
- return h == undefined ?
- ( this.length ? jQuery.css( this[0], n ) : null ) :
- this.css( n, h );
- };
- });
+ // Evalulates a script in a global context
+ // Evaluates Async. in Safari 2 :-(
+ globalEval: function( data ) {
+ data = jQuery.trim( data );
+ if ( data ) {
+ if ( window.execScript )
+ window.execScript( data );
+ else if ( jQuery.browser.safari )
+ // safari doesn't provide a synchronous global eval
+ window.setTimeout( data, 0 );
+ else
+ eval.call( window, data );
+ }
+ },
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
},
/**
- * A generic iterator function, which can be used to seemlessly
+ * A generic iterator function, which can be used to seamlessly
* 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 );
+ * The callback has two arguments:the key (objects) or index (arrays) as first
+ * the first, and the value as the second.
+ *
+ * @example $.each( [0,1,2], function(i, n){
+ * alert( "Item #" + i + ": " + n );
* });
- * @desc This is an example of iterating over the items in an array, accessing both the current item and its index.
+ * @desc This is an example of iterating over the items in an array,
+ * accessing both the current item and its index.
*
- * @example $.each( { name: "John", lang: "JS" }, function(i){
- * alert( "Name: " + i + ", Value: " + this );
+ * @example $.each( { name: "John", lang: "JS" }, function(i, n){
+ * alert( "Name: " + i + ", Value: " + n );
* });
- * @desc This is an example of iterating over the properties in an Object, accessing both the current item and its key.
+ *
+ * @desc This is an example of iterating over the properties in an
+ * Object, accessing both the current item and its key.
*
* @name $.each
* @param Object obj The object, or array, to iterate over.
* @param Function fn The function that will be executed on every object.
* @type Object
- * @cat Javascript
+ * @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, ol = obj.length; i < ol; i++ )
- if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
+ if ( args ) {
+ if ( obj.length == undefined )
+ for ( var i in obj )
+ fn.apply( obj[i], args );
+ else
+ for ( var i = 0, ol = obj.length; i < ol; i++ )
+ if ( fn.apply( obj[i], args ) === false ) break;
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( obj.length == undefined )
+ for ( var i in obj )
+ fn.call( obj[i], i, obj[i] );
+ else
+ for ( var i = 0, ol = obj.length, val = obj[0];
+ i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
+ }
+
return obj;
},
+
+ prop: function(elem, value, type, index, prop){
+ // Handle executable functions
+ if ( jQuery.isFunction( value ) )
+ value = value.call( elem, [index] );
+
+ // exclude the following css properties to add px
+ var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+
+ // Handle passing in a number to a CSS property
+ return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+ value + "px" :
+ value;
+ },
className: {
+ // internal only, use addClass("class")
add: function( elem, c ){
- jQuery.each( c.split(/\s+/), function(i, cur){
+ jQuery.each( (c || "").split(/\s+/), function(i, cur){
if ( !jQuery.className.has( elem.className, cur ) )
elem.className += ( elem.className ? " " : "" ) + cur;
});
},
+
+ // internal only, use removeClass("class")
remove: function( elem, c ){
- elem.className = c ?
- jQuery.grep( elem.className.split(/\s+/), function(cur){
- return !jQuery.className.has( c, cur );
- }).join(' ') : "";
+ elem.className = c != undefined ?
+ jQuery.grep( elem.className.split(/\s+/), function(cur){
+ return !jQuery.className.has( c, cur );
+ }).join(" ") : "";
},
- has: function( classes, c ){
- return classes && new RegExp("(^|\\s)" + c + "(\\s|$)").test( classes );
+
+ // internal only, use is(".class")
+ has: function( t, c ) {
+ return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
}
},
@@ -1199,13 +1499,13 @@ jQuery.extend({
if ( p == "height" || p == "width" ) {
var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
- for ( var i = 0, dl = d.length; i < dl; i++ ) {
- old["padding" + d[i]] = 0;
- old["border" + d[i] + "Width"] = 0;
- }
+ jQuery.each( d, function(){
+ old["padding" + this] = 0;
+ old["border" + this + "Width"] = 0;
+ });
jQuery.swap( e, old, function() {
- if (jQuery.css(e,"display") != "none") {
+ if ( jQuery(e).is(':visible') ) {
oHeight = e.offsetHeight;
oWidth = e.offsetWidth;
} else {
@@ -1215,14 +1515,14 @@ jQuery.extend({
visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
}).appendTo(e.parentNode)[0];
- var parPos = jQuery.css(e.parentNode,"position");
- if ( parPos == "" || parPos == "static" )
+ var parPos = jQuery.css(e.parentNode,"position") || "static";
+ if ( parPos == "static" )
e.parentNode.style.position = "relative";
oHeight = e.clientHeight;
oWidth = e.clientWidth;
- if ( parPos == "" || parPos == "static" )
+ if ( parPos == "static" )
e.parentNode.style.position = "static";
e.parentNode.removeChild(e);
@@ -1236,146 +1536,206 @@ jQuery.extend({
},
curCSS: function(elem, prop, force) {
- var ret;
-
- if (prop == 'opacity' && jQuery.browser.msie)
- return jQuery.attr(elem.style, 'opacity');
-
- if (prop == "float" || prop == "cssFloat")
- prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+ var ret, stack = [], swap = [];
+
+ // A helper method for determining if an element's values are broken
+ function color(a){
+ if ( !jQuery.browser.safari )
+ return false;
- if (!force && elem.style[prop]) {
+ var ret = document.defaultView.getComputedStyle(a,null);
+ return !ret || ret.getPropertyValue("color") == "";
+ }
+
+ if (prop == "opacity" && jQuery.browser.msie) {
+ ret = jQuery.attr(elem.style, "opacity");
+ return ret == "" ? "1" : ret;
+ }
+
+ if (prop.match(/float/i))
+ prop = styleFloat;
+ if (!force && elem.style[prop])
ret = elem.style[prop];
- } else if (document.defaultView && document.defaultView.getComputedStyle) {
+ else if (document.defaultView && document.defaultView.getComputedStyle) {
- if (prop == "cssFloat" || prop == "styleFloat")
+ if (prop.match(/float/i))
prop = "float";
prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
var cur = document.defaultView.getComputedStyle(elem, null);
- if ( cur )
+ if ( cur && !color(elem) )
ret = cur.getPropertyValue(prop);
- else if ( prop == 'display' )
- ret = 'none';
- else
- jQuery.swap(elem, { display: 'block' }, function() {
- var c = document.defaultView.getComputedStyle(this, '');
- ret = c && c.getPropertyValue(prop) || '';
- });
- } else if (elem.currentStyle) {
+ // If the element isn't reporting its values properly in Safari
+ // then some display: none elements are involved
+ else {
+ // Locate all of the parent display: none elements
+ for ( var a = elem; a && color(a); a = a.parentNode )
+ stack.unshift(a);
+
+ // Go through and make them visible, but in reverse
+ // (It would be better if we knew the exact display type that they had)
+ for ( a = 0; a < stack.length; a++ )
+ if ( color(stack[a]) ) {
+ swap[a] = stack[a].style.display;
+ stack[a].style.display = "block";
+ }
+
+ // Since we flip the display style, we have to handle that
+ // one special, otherwise get the value
+ ret = prop == "display" && swap[stack.length-1] != null ?
+ "none" :
+ document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
+ // Finally, revert the display styles back
+ for ( a = 0; a < swap.length; a++ )
+ if ( swap[a] != null )
+ stack[a].style.display = swap[a];
+ }
+
+ if ( prop == "opacity" && ret == "" )
+ ret = "1";
+
+ } else if (elem.currentStyle) {
var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
-
}
return ret;
},
- clean: function(a) {
+ clean: function(a, doc) {
var r = [];
- for ( var i = 0, al = a.length; i < al; i++ ) {
- var arg = a[i];
- if ( typeof arg == "string" ) { // Convert html string into DOM nodes
+ doc = doc || document;
+
+ jQuery.each( a, function(i,arg){
+ if ( !arg ) return;
+
+ if ( arg.constructor == Number )
+ arg = arg.toString();
+
+ // Convert html string into DOM nodes
+ if ( typeof arg == "string" ) {
// 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, "
", "
"];
+ var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
+
+ var wrap =
+ // option or optgroup
+ !s.indexOf("", ""] ||
+
+ !s.indexOf("", ""] ||
+
+ s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+ [1, "