X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=ebf98288d97501b8d9545b85daba30a7b2cb3e90;hb=02483b4a593fb5ae9bb3925f6fe9641e31e2828e;hp=6f35c999f6f595d773f514b08cd7b9515b290d81;hpb=ba7dc19416cf087c6b9c590234bac78b218d5874;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 6f35c99..ebf9828 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -15,31 +15,23 @@ window.undefined = window.undefined;
/**
* Create a new jQuery Object
*
- * @test ok( Array.prototype.push, "Array.push()" );
- * ok( Function.prototype.apply, "Function.apply()" );
- * ok( document.getElementById, "getElementById" );
- * ok( document.getElementsByTagName, "getElementsByTagName" );
- * ok( RegExp, "RegExp" );
- * ok( jQuery, "jQuery" );
- * ok( $, "$()" );
- *
* @constructor
* @private
* @name jQuery
* @cat Core
*/
-jQuery = function(a,c) {
-
- // Shortcut for document ready (because $(document).each() is silly)
- if ( a && typeof a == "function" && jQuery.fn.ready )
- return jQuery(document).ready(a);
-
+var jQuery = function(a,c) {
// Make sure that a selection was provided
- a = a || jQuery.context || document;
+ 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.merge( a, [] ) );
+ return jQuery( jQuery.makeArray( a ) );
// Watch for when a jQuery object is passed at the context
if ( c && c.jquery )
@@ -50,43 +42,36 @@ jQuery = function(a,c) {
return new jQuery(a,c);
// Handle HTML strings
- if ( a.constructor == String ) {
+ 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 ?
+ 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.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 so, execute it in context
- if ( fn && typeof fn == "function" )
- this.each(fn);
};
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
jQuery._$ = $;
+
+// Map the jQuery namespace to the '$' one
+var $ = jQuery;
/**
- * This function accepts a string containing a CSS selector,
- * basic XPath, or raw HTML, which is then used to match a set of elements.
- * The HTML string is different from the traditional selectors in that
- * it creates the DOM elements representing that HTML string, on the fly,
- * to be (assumedly) inserted into the document later.
+ * This function accepts a string containing a CSS or
+ * basic XPath selector which is then used to match a set of elements.
*
* The core functionality of jQuery centers around this function.
* Everything in jQuery is based upon this, or uses this in some way.
* The most basic use of this function is to pass in an expression
* (usually consisting of CSS or XPath), which then finds all matching
- * elements and remembers them for later use.
+ * elements.
*
* By default, $() looks for DOM elements within the context of the
* current HTML document.
@@ -96,29 +81,36 @@ if ( typeof $ != "undefined" )
* @before
one
two
three
* @result [
two
]
*
- * @example $("
Hello
").appendTo("#body")
- * @desc Creates a div element (and all of its contents) dynamically,
- * and appends it to the element with the ID of body. Internally, an
- * element is created and it's innerHTML property set to the given markup.
- * It is therefore both quite flexible and limited.
+ * @example $("input:radio", document.forms[0])
+ * @desc Searches for all inputs of type radio within the first form in the document
+ *
+ * @example $("div", xml.responseXML)
+ * @desc This finds all div elements within the specified XML document.
*
* @name $
- * @param String expr An expression to search with, or a string of HTML to create on the fly.
+ * @param String expr An expression to search with
+ * @param Element context (optional) A DOM Element, or Document, representing the base context.
* @cat Core
* @type jQuery
+ * @see $(Element)
+ * @see $(Element)
*/
-
+
/**
- * This function accepts a string containing a CSS selector, or
- * basic XPath, which is then used to match a set of elements with the
- * context of the specified DOM element, or document
+ * This function accepts a string of raw HTML.
*
- * @example $("div", xml.responseXML)
- * @desc This finds all div elements within the specified XML document.
+ * The HTML string is different from the traditional selectors in that
+ * it creates the DOM elements representing that HTML string, on the fly,
+ * to be (assumedly) inserted into the document later.
+ *
+ * @example $("
Hello
").appendTo("#body")
+ * @desc Creates a div element (and all of its contents) dynamically,
+ * and appends it to the element with the ID of body. Internally, an
+ * element is created and it's innerHTML property set to the given markup.
+ * It is therefore both quite flexible and limited.
*
* @name $
- * @param String expr An expression to search with.
- * @param Element context A DOM Element, or Document, representing the base context.
+ * @param String html A string of HTML to create on the fly.
* @cat Core
* @type jQuery
*/
@@ -161,6 +153,8 @@ if ( typeof $ != "undefined" )
* 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
* });
@@ -187,9 +181,6 @@ if ( typeof $ != "undefined" )
* @type jQuery
*/
-// Map the jQuery namespace to the '$' one
-var $ = jQuery;
-
jQuery.fn = jQuery.prototype = {
/**
* The current version of jQuery.
@@ -209,8 +200,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").length == 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
@@ -224,8 +213,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").size() == 2, "Get Number of Elements Found" );
- *
* @name size
* @type Number
* @cat Core
@@ -233,6 +220,8 @@ jQuery.fn = jQuery.prototype = {
size: function() {
return this.length;
},
+
+ length: 0,
/**
* Access all matched elements. This serves as a backwards-compatible
@@ -243,8 +232,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" );
- *
* @name get
* @type Array
* @cat Core
@@ -258,44 +245,58 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" );
- *
* @name get
* @type Element
* @param Number num Access the element in the Nth position.
* @cat Core
*/
+ get: function( num ) {
+ return num == undefined ?
+
+ // Return a 'clean' array
+ jQuery.makeArray( this ) :
+ // Return just the object
+ this[num];
+ },
+
/**
- * Set the jQuery object to an array of elements.
+ * Set the jQuery object to an array of elements, while maintaining
+ * the stack.
*
- * @example $("img").get([ document.body ]);
- * @result $("img").get() == [ document.body ]
+ * @example $("img").set([ document.body ]);
+ * @result $("img").set() == [ document.body ]
*
* @private
- * @name get
+ * @name set
* @type jQuery
* @param Elements elems An array of elements
* @cat Core
*/
- get: function( num ) {
- // Watch for when an array (of elements) is passed in
- if ( num && num.constructor == Array ) {
-
- // Use a tricky hack to make the jQuery object
- // look and feel like an array
- this.length = 0;
- [].push.apply( this, num );
-
- return this;
- } else
- return num == undefined ?
-
- // Return a 'clean' array
- jQuery.merge( this, [] ) :
-
- // Return just the object
- this[num];
+ set: function( a ) {
+ var ret = jQuery(this);
+ ret.prevObject = this;
+ return ret.setArray( a );
+ },
+
+ /**
+ * Set the jQuery object to an array of elements. This operation is
+ * completely destructive - be sure to use .set() if you wish to maintain
+ * the jQuery stack.
+ *
+ * @example $("img").setArray([ document.body ]);
+ * @result $("img").setArray() == [ document.body ]
+ *
+ * @private
+ * @name setArray
+ * @type jQuery
+ * @param Elements elems An array of elements
+ * @cat Core
+ */
+ setArray: function( a ) {
+ this.length = 0;
+ [].push.apply( this, a );
+ return this;
},
/**
@@ -308,25 +309,12 @@ jQuery.fn = jQuery.prototype = {
* argument representing the position of the element in the matched
* set.
*
- * @example $("img").each(function(){
- * this.src = "test.jpg";
- * });
- * @before
- * @result
- *
* @example $("img").each(function(i){
- * alert( "Image #" + i + " is " + this );
+ * this.src = "test" + i + ".jpg";
* });
* @before
- * @result
- *
- * @test var div = $("div");
- * div.each(function(){this.foo = 'zoo';});
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).foo != "zoo" ) pass = false;
- * }
- * ok( pass, "Execute a function, Relative" );
+ * @result
+ * @desc Iterates over two images and sets their src property
*
* @name each
* @type jQuery
@@ -354,16 +342,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result -1
*
- * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" );
- * ok( $([window, document]).index(document) == 1, "Check for index of elements" );
- * var inputElements = $('#radio1,#radio2,#check1,#check2');
- * ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );
- * ok( inputElements.index(window) == -1, "Check for not found index" );
- * ok( inputElements.index(document) == -1, "Check for not found index" );
- *
* @name index
* @type Number
* @param Object obj Object to search for
@@ -386,19 +364,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result test.jpg
*
- * @test ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
- * ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
- * ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
- * ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
- * ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
- * ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
- * ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
- * ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
- * ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
- * ok( $('#name').attr('name') == "name", 'Check for name attribute' );
- * ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
- * ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
- *
* @name attr
* @type Object
* @param String name The name of the property to access.
@@ -414,12 +379,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var pass = true;
- * $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
- * if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
- * });
- * ok( pass, "Set Multiple Attributes" );
- *
* @name attr
* @type jQuery
* @param Hash prop A set of key/value pairs to set as object properties.
@@ -429,36 +388,14 @@ jQuery.fn = jQuery.prototype = {
/**
* Set a single property to a value, on all matched elements.
*
+ * Note that you can't set the name property of input elements in IE.
+ * Use $(html) or $().append(html) or $().html(html) to create elements
+ * on the fly including the name property.
+ *
* @example $("img").attr("src","test.jpg");
* @before
* @result
*
- * @test var div = $("div");
- * div.attr("foo", "bar");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
- * }
- * ok( pass, "Set Attribute" );
- *
- * $("#name").attr('name', 'something');
- * ok( $("#name").name() == 'something', 'Set name attribute' );
- * $("#check2").attr('checked', true);
- * ok( document.getElementById('check2').checked == true, 'Set checked attribute' );
- * $("#check2").attr('checked', false);
- * ok( document.getElementById('check2').checked == false, 'Set checked attribute' );
- *
- * @test stop();
- * $.get('data/dashboard.xml', function(xml) {
- * var titles = [];
- * $('tab', xml).each(function() {
- * titles.push($(this).attr('title'));
- * });
- * ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
- * ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
- * start();
- * });
- *
* @name attr
* @type jQuery
* @param String key The name of the property to set.
@@ -467,7 +404,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 )
@@ -510,8 +447,6 @@ jQuery.fn = jQuery.prototype = {
* representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth,
* borderStyle, borderBottomWidth etc.
*
- * @test ok( $('#main').css("display") == 'none', 'Check for css property "display"');
- *
* @name css
* @type Object
* @param String name The name of the property to access.
@@ -527,12 +462,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css({display: 'none'});
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css({display: 'block'});
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param Hash prop A set of key/value pairs to set as style properties.
@@ -547,13 +476,6 @@ jQuery.fn = jQuery.prototype = {
* @result
Test Paragraph.
* @desc Changes the color of all paragraphs to red
*
- *
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css('display', 'none');
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css('display', 'block');
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param String key The name of the property to set.
@@ -573,19 +495,36 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result Test Paragraph.
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's Weblog";
- * ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );
+ * @name text
+ * @type String
+ * @cat DOM
+ */
+
+ /**
+ * Set the text contents of all matched elements. This has the same
+ * effect as calling .html() with your specified string.
+ *
+ * @example $("p").text("Some new text.");
+ * @before
Test Paragraph.
+ * @result
Some new text.
+ *
+ * @param String val The text value to set the contents of the element to.
*
* @name text
* @type String
* @cat DOM
*/
text: function(e) {
+ // A surprisingly high number of people expect the
+ // .text() method to do this, so lets do it!
+ if ( typeof e == "string" )
+ return this.html( e );
+
e = e || this;
var t = "";
- for ( var j = 0; j < e.length; j++ ) {
+ for ( var j = 0, el = e.length; j < el; j++ ) {
var r = e[j].childNodes;
- for ( var i = 0; i < r.length; i++ )
+ 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] ]);
@@ -611,11 +550,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap('
').text();
- * ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
- * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
- *
* @name wrap
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and wrapped around the target.
@@ -639,11 +573,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap(document.getElementById('empty')).parent();
- * ok( result.is('ol'), 'Check for element wrapping' );
- * ok( result.text() == defaultText, 'Check for element wrapping' );
- *
* @name wrap
* @type jQuery
* @param Element elem A DOM element that will be wrapped.
@@ -671,8 +600,8 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Append any number of elements to the inside of every matched elements,
- * generated from the provided HTML.
+ * Append content to the inside of every matched element.
+ *
* This operation is similar to doing an appendChild to all the
* specified elements, adding them into the document.
*
@@ -680,52 +609,21 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
I would like to say: Hello
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').append('buga');
- * ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
- *
- * @name append
- * @type jQuery
- * @param String html A string of HTML, that will be created on the fly and appended to the target.
- * @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
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
- * $('#sap').append(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for appending of element" );
- *
- * @name append
- * @type jQuery
- * @param Element elem A DOM element that will be appended.
- * @cat DOM/Manipulation
- */
-
- /**
- * Append any number of elements to the inside of all matched elements.
- * This operation is similar to doing an appendChild to all the
- * 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
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
- * $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for appending of array of elements" );
- *
* @name append
* @type jQuery
- * @param Array elems An array of elements, all of which will be appended.
+ * @param content Content to append to the target
* @cat DOM/Manipulation
+ * @see prepend()
+ * @see before()
+ * @see after()
*/
append: function() {
return this.domManip(arguments, true, 1, function(a){
@@ -734,118 +632,59 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * 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.
+ * Prepend content to the inside of every matched element.
+ *
+ * This operation is the best way to insert elements
+ * inside, at the beginning, of all matched elements.
*
* @example $("p").prepend("Hello");
* @before
I would like to say:
* @result
HelloI would like to say:
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').prepend('buga');
- * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
- *
- * @name prepend
- * @type jQuery
- * @param String html A string of HTML, that will be created on the fly and appended to the target.
- * @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:
- *
- * @test var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for prepending of element" );
- *
- * @name prepend
- * @type jQuery
- * @param Element elem A DOM element that will be appended.
- * @cat DOM/Manipulation
- */
-
- /**
- * Prepend any number of elements to the inside of all matched elements.
- * This operation is the best way to insert a set of elements inside, at the
- * beginning, of all the matched element.
- *
+ *
* @example $("p").prepend( $("b") );
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
*
- * @test var expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
- *
* @name prepend
* @type jQuery
- * @param Array elems An array of elements, all of which will be appended.
+ * @param content Content to prepend to the target.
* @cat DOM/Manipulation
+ * @see append()
+ * @see before()
+ * @see after()
*/
prepend: function() {
return this.domManip(arguments, true, -1, function(a){
this.insertBefore( a, this.firstChild );
});
},
-
+
/**
- * Insert any number of dynamically generated elements before each of the
- * matched elements.
+ * Insert content before each of the matched elements.
*
* @example $("p").before("Hello");
* @before
I would like to say:
* @result Hello
I would like to say:
*
- * @test var expected = 'This is a normal link: bugaYahoo';
- * $('#yahoo').before('buga');
- * ok( expected == $('#en').text(), 'Insert String before' );
- *
- * @name before
- * @type jQuery
- * @param String html A string of HTML, that will be created on the fly and appended to the target.
- * @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:
*
- * @test var expected = "This is a normal link: Try them out:Yahoo";
- * $('#yahoo').before(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element before" );
- *
- * @name before
- * @type jQuery
- * @param Element elem A DOM element that will be appended.
- * @cat DOM/Manipulation
- */
-
- /**
- * Insert any number of elements before each of the matched elements.
- *
* @example $("p").before( $("b") );
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
*
- * @test var expected = "This is a normal link: Try them out:diveintomarkYahoo";
- * $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements before" );
- *
* @name before
* @type jQuery
- * @param Array elems An array of elements, all of which will be appended.
+ * @param content Content to insert before each target.
* @cat DOM/Manipulation
+ * @see append()
+ * @see prepend()
+ * @see after()
*/
before: function() {
return this.domManip(arguments, false, 1, function(a){
@@ -854,55 +693,27 @@ jQuery.fn = jQuery.prototype = {
},
/**
- * Insert any number of dynamically generated elements after each of the
- * matched elements.
+ * Insert content after each of the matched elements.
*
* @example $("p").after("Hello");
* @before
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = 'This is a normal link: Yahoobuga';
- * $('#yahoo').after('buga');
- * ok( expected == $('#en').text(), 'Insert String after' );
- *
- * @name after
- * @type jQuery
- * @param String html A string of HTML, that will be created on the fly and appended to the target.
- * @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
*
- * @test var expected = "This is a normal link: YahooTry them out:";
- * $('#yahoo').after(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element after" );
- *
- * @name after
- * @type jQuery
- * @param Element elem A DOM element that will be appended.
- * @cat DOM/Manipulation
- */
-
- /**
- * Insert any number of elements after each of the matched elements.
- *
* @example $("p").after( $("b") );
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = "This is a normal link: YahooTry them out:diveintomark";
- * $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements after" );
- *
* @name after
* @type jQuery
- * @param Array elems An array of elements, all of which will be appended.
+ * @param content Content to insert after each target.
* @cat DOM/Manipulation
+ * @see append()
+ * @see prepend()
+ * @see before()
*/
after: function() {
return this.domManip(arguments, false, -1, function(a){
@@ -915,18 +726,18 @@ jQuery.fn = jQuery.prototype = {
* back to its previous state. After an end operation, the list of matched elements will
* revert to the last state of matched elements.
*
+ * If there was no destructive operation before, an empty set is returned.
+ *
* @example $("p").find("span").end();
* @before
]
*
* @name filter
* @type jQuery
* @param String expr An expression to search with.
* @cat DOM/Traversing
*/
+
+ /**
+ * Removes all elements from the set of matched elements that do not
+ * 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;
+ * })
+ * @before
Hello
How are you?
+ * @result [
How are you?
]
+ * @desc Remove all elements that have a child ol element
+ *
+ * @name filter
+ * @type jQuery
+ * @param Function filter A function to use for filtering
+ * @cat DOM/Traversing
+ */
/**
* Removes all elements from the set of matched elements that do not
@@ -1017,7 +834,7 @@ jQuery.fn = jQuery.prototype = {
*
* @example $("p").filter([".selected", ":first"])
* @before
]
*
- * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not")
- *
* @name not
* @type jQuery
* @param String expr An expression with which to remove matching elements
* @cat DOM/Traversing
*/
not: function(t) {
- return this.pushStack( t.constructor == String ?
- jQuery.filter(t,this,false).r :
- jQuery.grep(this,function(a){ return a != t; }), arguments );
+ return this.set( typeof t == "string" ?
+ jQuery.filter(t,this,true).r :
+ jQuery.grep(this,function(a){ return a != t; }) );
},
/**
@@ -1120,14 +936,16 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Traversing
*/
add: function(t) {
- return this.pushStack( jQuery.merge( this, t.constructor == String ?
- jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments );
+ return this.set( jQuery.merge(
+ this.get(), typeof t == "string" ?
+ jQuery.find(t) :
+ t.constructor == Array ? t : [t] ) );
},
/**
* Checks the current selection against an expression and returns true,
- * if the selection fits the given expression. Does return false, if the
- * selection does not fit or the expression is not valid.
+ * if at least one element of the selection fits the given expression.
+ * Does return false, if no element fits or the expression is not valid.
*
* @example $("input[@type='checkbox']").parent().is("form")
* @before
@@ -1144,29 +962,6 @@ jQuery.fn = jQuery.prototype = {
* @result false
* @desc An invalid expression always returns false.
*
- * @test ok( $('#form').is('form'), 'Check for element: A form must be a form' );
- * ok( !$('#form').is('div'), 'Check for element: A form is not a div' );
- * ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' );
- * ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' );
- * ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' );
- * ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' );
- * ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' );
- * ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' );
- * ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' );
- * ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' );
- * ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' );
- * ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' );
- * ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' );
- * ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' );
- * ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' );
- * ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' );
- * ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' );
- * ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' );
- * ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' );
- * ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' );
- * ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' );
- * ok( !$('#foo').is(undefined), 'Expected false for an invalid expression - undefined' );
- *
* @name is
* @type Boolean
* @param String expr The expression with which to filter
@@ -1177,126 +972,102 @@ jQuery.fn = jQuery.prototype = {
},
/**
- *
- *
* @private
* @name domManip
* @param Array args
- * @param Boolean table
- * @param Number int
+ * @param Boolean table Insert TBODY in TABLEs if one is not found.
+ * @param Number dir If dir<0, process args in reverse order.
* @param Function fn The function doing the DOM manipulation.
* @type jQuery
* @cat Core
*/
domManip: function(args, table, dir, fn){
- var clone = this.size() > 1;
+ var clone = this.length > 1;
var a = jQuery.clean(args);
+ if ( dir < 0 )
+ a.reverse();
return this.each(function(){
var obj = this;
- if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() != "THEAD" ) {
- var tbody = this.getElementsByTagName("tbody");
+ if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+ obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
- if ( !tbody.length ) {
- obj = document.createElement("tbody");
- this.appendChild( obj );
- } else
- obj = tbody[0];
- }
+ for ( var i = 0, al = a.length; i < al; i++ )
+ fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
- for ( var i = ( dir < 0 ? a.length - 1 : 0 );
- i != ( dir < 0 ? dir : a.length ); i += dir ) {
- fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
- }
});
- },
-
- /**
- *
- *
- * @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 fn2 = args && args[args.length-2];
-
- if ( fn && fn.constructor != Function ) fn = null;
- if ( fn2 && fn2.constructor != Function ) fn2 = null;
-
- if ( !fn ) {
- if ( !this.stack ) this.stack = [];
- this.stack.push( this.get() );
- this.get( a );
- } else {
- var old = this.get();
- this.get( a );
-
- if ( fn2 && a.length || !fn2 )
- this.each( fn2 || fn ).get( old );
- else
- this.get( old ).each( fn );
- }
-
- return this;
}
};
/**
- * Extends the jQuery object itself. Can be used to add both static
- * functions and plugin methods.
+ * Extends the jQuery object itself. Can be used to add functions into
+ * the jQuery namespace and to add plugin methods (plugins).
*
- * @example $.fn.extend({
+ * @example jQuery.fn.extend({
* check: function() {
- * this.each(function() { this.checked = true; });
+ * return this.each(function() { this.checked = true; });
* ),
* uncheck: function() {
- * this.each(function() { this.checked = false; });
+ * return this.each(function() { this.checked = false; });
* }
* });
* $("input[@type=checkbox]").check();
* $("input[@type=radio]").uncheck();
* @desc Adds two plugin methods.
*
- * @private
- * @name extend
- * @param Object obj
+ * @example jQuery.extend({
+ * min: function(a, b) { return a < b ? a : b; },
+ * max: function(a, b) { return a > b ? a : b; }
+ * });
+ * @desc Adds two functions into the jQuery namespace
+ *
+ * @name $.extend
+ * @param Object prop The object that will be merged into the jQuery object
* @type Object
* @cat Core
*/
/**
- * Extend one object with another, returning the original,
+ * Extend one object with one or more others, returning the original,
* modified, object. This is a great utility for simple inheritance.
*
* @example var settings = { validate: false, limit: 5, name: "foo" };
* var options = { validate: true, name: "bar" };
* jQuery.extend(settings, options);
* @result settings == { validate: true, limit: 5, name: "bar" }
+ * @desc Merge settings and options, modifying settings
*
- * @test var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" };
- * var options = { xnumber2: 1, xstring2: "x", xxx: "newstring" };
- * var optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" };
- * var merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" };
- * jQuery.extend(settings, options);
- * isSet( settings, merged, "Check if extended: settings must be extended" );
- * isSet ( options, optionsCopy, "Check if not modified: options must not be modified" );
+ * @example var defaults = { validate: false, limit: 5, name: "foo" };
+ * var options = { validate: true, name: "bar" };
+ * var settings = jQuery.extend({}, defaults, options);
+ * @result settings == { validate: true, limit: 5, name: "bar" }
+ * @desc Merge defaults and options, without modifying the defaults
*
* @name $.extend
- * @param Object obj The object to extend
- * @param Object prop The object that will be merged into the first.
+ * @param Object target The object to extend
+ * @param Object prop1 The object that will be merged into the first.
+ * @param Object propN (optional) More objects to merge into the first
* @type Object
* @cat Javascript
*/
-jQuery.extend = jQuery.fn.extend = function(obj,prop) {
- if ( !prop ) { prop = obj; obj = this; }
- for ( var i in prop ) obj[i] = prop[i];
- return obj;
+jQuery.extend = jQuery.fn.extend = function() {
+ // copy reference to target object
+ var target = arguments[0],
+ a = 1;
+
+ // extend jQuery itself if only one argument is passed
+ if ( arguments.length == 1 ) {
+ target = this;
+ a = 0;
+ }
+ var prop;
+ while (prop = arguments[a++])
+ // Extend the base object
+ for ( var i in prop ) target[i] = prop[i];
+
+ // Return the modified object
+ return target;
};
jQuery.extend({
@@ -1312,9 +1083,9 @@ jQuery.extend({
jQuery.each( jQuery.macros.axis, function(i,n){
jQuery.fn[ i ] = function(a) {
var ret = jQuery.map(this,n);
- if ( a && a.constructor == String )
+ if ( a && typeof a == "string" )
ret = jQuery.filter(a,ret).r;
- return this.pushStack( ret, arguments );
+ return this.set( ret );
};
});
@@ -1322,7 +1093,7 @@ jQuery.extend({
jQuery.fn[ i ] = function(){
var a = arguments;
return this.each(function(){
- for ( var j = 0; j < a.length; j++ )
+ for ( var j = 0, al = a.length; j < al; j++ )
jQuery(a[j])[n]( this );
});
};
@@ -1381,39 +1152,32 @@ jQuery.extend({
* @type Object
* @cat Javascript
*/
+ // args is for internal usage only
each: function( obj, fn, args ) {
if ( obj.length == undefined )
for ( var i in obj )
- if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
+ fn.apply( obj[i], args || [i, obj[i]] );
else
- for ( var i = 0; i < obj.length; i++ )
+ for ( var i = 0, ol = obj.length; i < ol; 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;
+ add: function( elem, c ){
+ jQuery.each( c.split(/\s+/), function(i, cur){
+ if ( !jQuery.className.has( elem.className, cur ) )
+ elem.className += ( elem.className ? " " : "" ) + cur;
+ });
},
- remove: function(o,c){
- if( !c ) {
- o.className = "";
- } else {
- var classes = o.className.split(" ");
- for(var i=0; i", ""];
+ 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;
- var table = "";
-
- if ( !a[i].indexOf("" + a[i] + "";
- } else if ( !a[i].indexOf("
" && s.indexOf("= 0 ; --n )
+ if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
+ tb[n].parentNode.removeChild(tb[n]);
}
}
-
- }
-
- if ( t ) {
- var val = jQuery.filter(t,r);
- ret = r = val.r;
- t = jQuery.trim(val.t);
- }
+
+ 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, argl = arg.length; n < argl; n++ ) // Handles Array, jQuery, DOM NodeList collections
+ r.push(arg[n]);
+ else
+ r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) );
}
- if ( ret && ret[0] == context ) ret.shift();
- done = jQuery.merge( done, ret );
-
- return done;
- },
-
- getAll: function(o,r) {
- r = r || [];
- var s = o.childNodes;
- for ( var i = 0; i < s.length; i++ )
- if ( s[i].nodeType == 1 ) {
- r.push( s[i] );
- jQuery.getAll( s[i], r );
- }
return r;
},
-
+
attr: function(elem, name, value){
var fix = {
"for": "htmlFor",
@@ -1846,111 +1338,50 @@ jQuery.extend({
className: "className",
value: "value",
disabled: "disabled",
- checked: "checked"
+ checked: "checked",
+ readonly: "readOnly",
+ selected: "selected"
};
// IE actually uses filters for opacity ... elem is actually elem.style
- if (name == "opacity" && jQuery.browser.msie && value != undefined) {
+ if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
// IE has trouble with opacity if it does not have layout
- // Would prefer to check element.hasLayout first but don't have access to the element here
- elem['zoom'] = 1;
- if (value == 1) // Remove filter to avoid more IE weirdness
- return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,"");
- else
- return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,"") + "alpha(opacity=" + value * 100 + ")";
- } else if (name == "opacity" && jQuery.browser.msie) {
- return elem["filter"] ? parseFloat( elem["filter"].match(/alpha\(opacity=(.*)\)/)[1] )/100 : 1;
+ // 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;
+ 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') ) {
+
+ } else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
return elem.getAttributeNode(name).nodeValue;
- } else if ( elem.getAttribute != undefined && elem.tagName ) { // IE elem.getAttribute passes even for style
+
+ // 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 *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]",
-
- // Match: [div], [div p]
- "(\\[)\s*(.*?)\s*\\]",
-
- // Match: :contains('foo')
- "(:)S\\(\"?'?([^\\)]*?)\"?'?\\)",
-
- // Match: :even, :last-chlid
- "([:.#]*)S"
- ],
-
- filter: function(t,r,not) {
- // Figure out if we're doing regular, or inverse, filtering
- var g = not !== false ? jQuery.grep :
- function(a,f) {return jQuery.grep(a,f,true);};
-
- while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
-
- var p = jQuery.parse;
-
- for ( var i = 0; i < p.length; 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 first match
- if ( !i )
- m = ["",m[1], m[3], m[2], m[5]];
-
- // Remove what we just matched
- t = t.replace( re, "" );
-
- break;
- }
- }
-
- // :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;
-
- // Otherwise, find the expression to execute
- else {
- var f = jQuery.expr[m[1]];
- if ( f.constructor != 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]);" : "" ) +
- "return " + f + "}");
-
- // Execute it against the current filter
- r = g( r, f );
- }
- }
-
- // 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.
*
@@ -1966,55 +1397,23 @@ jQuery.extend({
return t.replace(/^\s+|\s+$/g, "");
},
- /**
- * All ancestors of a given element.
- *
- * @private
- * @name $.parents
- * @type Array
- * @param Element elem The element to find the ancestors of.
- * @cat DOM/Traversing
- */
- parents: function( elem ){
- var matched = [];
- var cur = elem.parentNode;
- while ( cur && cur != document ) {
- matched.push( cur );
- cur = cur.parentNode;
- }
- return matched;
- },
+ makeArray: function( a ) {
+ var r = [];
- /**
- * All elements on a specified axis.
- *
- * @private
- * @name $.sibling
- * @type Array
- * @param Element elem The element to find all the siblings of (including itself).
- * @cat DOM/Traversing
- */
- sibling: function(elem, pos, not) {
- var elems = [];
-
- if(elem) {
- var siblings = elem.parentNode.childNodes;
- for ( var i = 0; i < siblings.length; i++ ) {
- if ( not === true && siblings[i] == elem ) continue;
-
- if ( siblings[i].nodeType == 1 )
- elems.push( siblings[i] );
- if ( siblings[i] == elem )
- elems.n = elems.length - 1;
- }
- }
+ if ( a.constructor != Array ) {
+ for ( var i = 0, al = a.length; i < al; 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, al = a.length; i < al; i++ )
+ if ( a[i] == b )
+ return i;
+ return -1;
},
/**
@@ -2035,29 +1434,18 @@ jQuery.extend({
* @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
- 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] );
+ var r = [].slice.call( first, 0 );
+
+ // Now check for duplicates between the two arrays
+ // and only add the unique items
+ for ( var i = 0, sl = second.length; i < sl; 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;
},
/**
@@ -2082,14 +1470,14 @@ jQuery.extend({
grep: function(elems, fn, inv) {
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
- if ( fn.constructor == String )
+ if ( typeof fn == "string" )
fn = new Function("a","i","return " + fn);
var result = [];
// Go through the array, only saving the items
// that pass the validator function
- for ( var i = 0; i < elems.length; i++ )
+ for ( var i = 0, el = elems.length; i < el; i++ )
if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
result.push( elems[i] );
@@ -2128,150 +1516,33 @@ jQuery.extend({
map: function(elems, fn) {
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
- if ( fn.constructor == String )
+ if ( typeof fn == "string" )
fn = new Function("a","return " + fn);
- var result = [];
+ var result = [], r = [];
// Go through the array, translating each of the items to their
// new value (or values).
- for ( var i = 0; i < elems.length; i++ ) {
+ for ( var i = 0, el = elems.length; i < el; i++ ) {
var val = fn(elems[i],i);
if ( val !== null && val != undefined ) {
if ( val.constructor != Array ) val = [val];
- result = jQuery.merge( result, val );
+ result = result.concat( val );
}
}
- return result;
- },
-
- /*
- * 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) {
- // For whatever reason, IE has trouble passing the window object
- // 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 = {};
+ var r = [ result[0] ];
- // Get the current list of functions bound to this event
- var handlers = element.events[type];
+ check: for ( var i = 1, rl = result.length; i < rl; i++ ) {
+ for ( var j = 0; j < i; j++ )
+ if ( result[i] == r[j] )
+ continue check;
- // 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];
- }
-
- // 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)
- if (type && element.events[type])
- if ( handler )
- delete element.events[type][handler.guid];
- else
- for ( var i in element.events[type] )
- delete element.events[type][i];
- else
- for ( var j in element.events )
- this.remove( element, j );
- },
-
- trigger: function(type,data,element) {
- // Touch up the incoming data
- data = 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;
-
- 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, args ) === false ) {
- event.preventDefault();
- event.stopPropagation();
- returnValue = false;
- }
- }
-
- return returnValue;
- },
-
- fix: function(event) {
- if ( event ) {
- event.preventDefault = function() {
- this.returnValue = false;
- };
-
- event.stopPropagation = function() {
- this.cancelBubble = true;
- };
- }
-
- return event;
+ r.push( result[i] );
}
+ return r;
}
});
@@ -2281,19 +1552,31 @@ jQuery.extend({
* This property is available before the DOM is ready, therefore you can
* use it to add ready events only for certain browsers.
*
- * See
- * jQBrowser plugin for advanced browser detection:
+ * 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
+ * @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();
@@ -2683,9 +1966,6 @@ jQuery.macros = {
* @before
* @result "some text"
*
- * @test ok( $("#text1").val() == "Test", "Check for value of input element" );
- * ok( !$("#text1").val() == "", "Check for value of input element" );
- *
* @name val
* @type String
* @cat DOM/Attributes
@@ -2698,11 +1978,6 @@ jQuery.macros = {
* @before
* @result
*
- * @test document.getElementById('text1').value = "bla";
- * ok( $("#text1").val() == "bla", "Check for modified value of input element" );
- * $("#text1").val('test');
- * ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
- *
* @name val
* @type jQuery
* @param String val Set the property to the specified value.
@@ -2712,6 +1987,7 @@ jQuery.macros = {
/**
* Get the html contents of the first matched element.
+ * This property is not available on XML documents.
*
* @example $("div").html();
* @before
@@ -2724,19 +2000,12 @@ jQuery.macros = {
/**
* Set the html contents of every matched element.
+ * This property is not available on XML documents.
*
* @example $("div").html("new stuff");
* @before
* @result
new stuff
*
- * @test var div = $("div");
- * div.html("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).childNodes.length == 0 ) pass = false;
- * }
- * ok( pass, "Set HTML" );
- *
* @name html
* @type jQuery
* @param String val Set the html contents to the specified value.
@@ -2751,10 +2020,6 @@ jQuery.macros = {
* @before
* @result "test"
*
- * @test ok( $(document.getElementById('main')).id() == "main", "Check for id" );
- * ok( $("#foo").id() == "foo", "Check for id" );
- * ok( !$("head").id(), "Check for id" );
- *
* @name id
* @type String
* @cat DOM/Attributes
@@ -2781,9 +2046,6 @@ jQuery.macros = {
* @before
* @result "my image"
*
- * @test ok( $(document.getElementById('google')).title() == "Google!", "Check for title" );
- * ok( !$("#yahoo").title(), "Check for title" );
- *
* @name title
* @type String
* @cat DOM/Attributes
@@ -2810,10 +2072,6 @@ jQuery.macros = {
* @before
* @result "username"
*
- * @test ok( $(document.getElementById('text1')).name() == "action", "Check for name" );
- * ok( $("#hidden1").name() == "hidden", "Check for name" );
- * ok( !$("#area1").name(), "Check for name" );
- *
* @name name
* @type String
* @cat DOM/Attributes
@@ -2945,35 +2203,7 @@ jQuery.macros = {
* Get a set of elements containing the unique ancestors of the matched
* set of elements (except for the root element).
*
- * @example $("span").ancestors()
- * @before
Hello
Hello Again
- * @result [ ...,
...
,
Hello
]
- *
- * @name ancestors
- * @type jQuery
- * @cat DOM/Traversing
- */
-
- /**
- * Get a set of elements containing the unique ancestors of the matched
- * set of elements, and filtered by an expression.
- *
- * @example $("span").ancestors("p")
- * @before
Hello
Hello Again
- * @result [
Hello
]
- *
- * @name ancestors
- * @type jQuery
- * @param String expr An expression to filter the ancestors with
- * @cat DOM/Traversing
- */
- ancestors: jQuery.parents,
-
- /**
- * Get a set of elements containing the unique ancestors of the matched
- * set of elements (except for the root element).
- *
- * @example $("span").ancestors()
+ * @example $("span").parents()
* @before
Hello
Hello Again
* @result [ ...,
...
,
Hello
]
*
@@ -2986,7 +2216,7 @@ jQuery.macros = {
* Get a set of elements containing the unique ancestors of the matched
* set of elements, and filtered by an expression.
*
- * @example $("span").ancestors("p")
+ * @example $("span").parents("p")
* @before
Hello
Hello Again
* @result [
Hello
]
*
@@ -3027,7 +2257,7 @@ jQuery.macros = {
* @param String expr An expression to filter the next Elements with
* @cat DOM/Traversing
*/
- next: "jQuery.sibling(a).next",
+ next: "jQuery.nth(a,1,'nextSibling')",
/**
* Get a set of elements containing the unique previous siblings of each of the
@@ -3050,7 +2280,7 @@ jQuery.macros = {
*
* It only returns the immediately previous sibling, not all previous siblings.
*
- * @example $("p").previous(".selected")
+ * @example $("p").prev(".selected")
* @before
Hello
Hello Again
And Again
* @result [
Hello
]
*
@@ -3059,7 +2289,7 @@ jQuery.macros = {
* @param String expr An expression to filter the previous Elements with
* @cat DOM/Traversing
*/
- prev: "jQuery.sibling(a).prev",
+ prev: "jQuery.nth(a,1,'previousSibling')",
/**
* Get a set of elements containing all of the unique siblings of each of the
@@ -3069,8 +2299,6 @@ jQuery.macros = {
* @before
]
*
- * @test isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" );
- * isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
- *
* @name siblings
* @type jQuery
* @param String expr An expression to filter the sibling Elements with
* @cat DOM/Traversing
*/
- siblings: "jQuery.sibling(a, null, true)",
-
+ siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
/**
* Get a set of elements containing all of the unique children of each of the
@@ -3103,8 +2327,6 @@ jQuery.macros = {
* @before
]
*
- * @test var div = $("div");
- * div.addClass("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
- * }
- * ok( pass, "Add Class" );
- *
* @name addClass
* @type jQuery
* @param String class A CSS class to add to the elements
@@ -3235,33 +2442,19 @@ jQuery.macros = {
},
/**
- * Removes the specified class from the set of matched elements.
+ * Removes all or the specified class from the set of matched elements.
*
- * @example $("p").removeClass("selected")
+ * @example $("p").removeClass()
* @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" );
- *
- * reset();
- *
- * var div = $("div").addClass("test").addClass("foo").addClass("bar");
- * div.removeClass("test").removeClass("bar").removeClass("foo");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).className.match(/test|bar|foo/) ) pass = false;
- * }
- * ok( pass, "Remove multiple classes" );
+ * @example $("p").removeClass("selected")
+ * @before
Hello
+ * @result [
Hello
]
*
* @name removeClass
* @type jQuery
- * @param String class A CSS class to remove from the elements
+ * @param String class (optional) A CSS class to remove from the elements
* @cat DOM
*/
removeClass: function(c){
@@ -3269,8 +2462,8 @@ jQuery.macros = {
},
/**
- * Adds the specified class if it is present, removes it if it is
- * not present.
+ * Adds the specified class if it is not present, removes it if it is
+ * present.
*
* @example $("p").toggleClass("selected")
* @before
Hello
Hello Again
@@ -3282,7 +2475,7 @@ 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);
},
/**
@@ -3331,108 +2524,8 @@ jQuery.macros = {
empty: function(){
while ( this.firstChild )
this.removeChild( this.firstChild );
- },
-
- /**
- * 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 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.
- *
- * @example $("form").bind( "submit", function(event) {
- * event.preventDefault();
- * } );
- * @desc Cancel only the default action by using the preventDefault method.
- *
- *
- * @example $("form").bind( "submit", function(event) {
- * event.stopPropagation();
- * } )
- * @desc Stop only an event from bubbling by using the stopPropagation method.
- *
- * @name bind
- * @type jQuery
- * @param String type An event type
- * @param Function fn A function to bind to the event on each of the set of matched elements
- * @cat Events
- */
- bind: function( type, fn ) {
- if ( fn.constructor == String )
- fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
- jQuery.event.add( this, type, fn );
- },
-
- /**
- * 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
- * bind method.
- *
- * @example $("p").unbind( "click", function() { alert("Hello"); } )
- * @before
Hello
- * @result [
Hello
]
- *
- * @name unbind
- * @type jQuery
- * @param String type An event type
- * @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.
- *
- * @example $("p").unbind( "click" )
- * @before
Hello
- * @result [
Hello
]
- *
- * @name unbind
- * @type jQuery
- * @param String type An event type
- * @cat Events
- */
-
- /**
- * Removes all bound events from each of the matched elements.
- *
- * @example $("p").unbind()
- * @before