X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e12245c05616bd63af54e03f4f5313e1de0319b8;hb=68313e77488d98d7419e87c7090d4ec9b9d4882b;hp=65732b8f7a0b9d7ccfa5e41d84cff7510081840d;hpb=97ea47492fe13ddb1108045c244d5af6570ace92;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 65732b8..e12245c 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,5 +1,5 @@
/*
- * jQuery - New Wave Javascript
+ * jQuery @VERSION - New Wave Javascript
*
* Copyright (c) 2006 John Resig (jquery.com)
* Dual licensed under the MIT (MIT-LICENSE.txt)
@@ -15,23 +15,15 @@ window.undefined = window.undefined;
/**
* Create a new jQuery Object
*
- * @test ok( Array.prototype.push, "Array.push()" );
- * @test ok( Function.prototype.apply, "Function.apply()" );
- * @test ok( document.getElementById, "getElementById" );
- * @test ok( document.getElementsByTagName, "getElementsByTagName" );
- * @test ok( RegExp, "RegExp" );
- * @test ok( jQuery, "jQuery" );
- * @test ok( $, "$()" );
- *
* @constructor
* @private
* @name jQuery
* @cat Core
*/
-function jQuery(a,c) {
+var jQuery = function(a,c) {
// Shortcut for document ready (because $(document).each() is silly)
- if ( a && a.constructor == Function && jQuery.fn.ready )
+ if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function
return jQuery(document).ready(a);
// Make sure that a selection was provided
@@ -50,28 +42,35 @@ function jQuery(a,c) {
return new jQuery(a,c);
// Handle HTML strings
- var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
- if ( m ) a = jQuery.clean( [ m[1] ] );
+ if ( typeof a == "string" ) {
+ var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
+ if ( m ) a = jQuery.clean( [ m[1] ] );
+ }
// Watch for when an array is passed in
- this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ?
+ this.get( a.constructor == Array || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType ?
// Assume that it is an array of DOM Elements
jQuery.merge( a, [] ) :
// Find the matching elements and save them for later
jQuery.find( a, c ) );
- // See if an extra function was provided
+ // See if an extra function was provided
var fn = arguments[ arguments.length - 1 ];
// If so, execute it in context
- if ( fn && fn.constructor == Function )
+ if ( fn && typeof fn == "function" )
this.each(fn);
-}
+
+ return this;
+};
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
jQuery._$ = $;
+
+// Map the jQuery namespace to the '$' one
+var $ = jQuery;
/**
* This function accepts a string containing a CSS selector,
@@ -95,7 +94,10 @@ if ( typeof $ != "undefined" )
* @result [
two
]
*
* @example $("
Hello
").appendTo("#body")
- * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body.
+ * @desc Creates a div element (and all of its contents) dynamically,
+ * and appends it to the element with the ID of body. Internally, an
+ * element is created and it's innerHTML property set to the given markup.
+ * It is therefore both quite flexible and limited.
*
* @name $
* @param String expr An expression to search with, or a string of HTML to create on the fly.
@@ -127,9 +129,8 @@ if ( typeof $ != "undefined" )
* @before
one
two
three
* @result [
two
]
*
- * @example $(document).ready( loaded );
- * @desc Executes the "loaded" function when the DOM is ready to
- * be manipulated.
+ * @example $(document.body).background( "black" );
+ * @desc Sets the background color of the page to black.
*
* @name $
* @param Element elem A DOM element to be encapsulated by a jQuery object.
@@ -151,10 +152,16 @@ if ( typeof $ != "undefined" )
/**
* A shorthand for $(document).ready(), allowing you to bind a function
- * to be executed when the DOM document has finished loading.
+ * to be executed when the DOM document has finished loading. This function
+ * behaves just like $(document).ready(), in that it should be used to wrap
+ * all of the other $() operations on your page. While this function is,
+ * technically, chainable - there really isn't much use for chaining against it.
+ * You can have as many $(document).ready events on your page as you like.
*
- * @example $( loaded )
- * @desc Executes the function "loaded" when the DOM is ready to be used.
+ * @example $(function(){
+ * // Document is ready
+ * });
+ * @desc Executes the function when the DOM is ready to be used.
*
* @name $
* @param Function fn The function to execute when the DOM is ready.
@@ -163,11 +170,13 @@ if ( typeof $ != "undefined" )
*/
/**
- * A means of creating a duplicate copy of a jQuery object.
+ * A means of creating a cloned copy of a jQuery object. This function
+ * copies the set of matched elements from one jQuery object and creates
+ * another, new, jQuery object containing the same elements.
*
* @example var div = $("div");
- * $( div ).find("p")
- * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div'.
+ * $( div ).find("p");
+ * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div' (as would normally be the case if a simple div.find("p") was done).
*
* @name $
* @param jQuery obj The jQuery object to be cloned.
@@ -175,12 +184,9 @@ if ( typeof $ != "undefined" )
* @type jQuery
*/
-// Map the jQuery namespace to the '$' one
-var $ = jQuery;
-
jQuery.fn = jQuery.prototype = {
/**
- * The current SVN version of jQuery.
+ * The current version of jQuery.
*
* @private
* @property
@@ -188,7 +194,7 @@ jQuery.fn = jQuery.prototype = {
* @type String
* @cat Core
*/
- jquery: "$Rev$",
+ jquery: "@VERSION",
/**
* The number of elements currently matched.
@@ -197,8 +203,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
@@ -212,8 +216,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" );
- *
* @name size
* @type Number
* @cat Core
@@ -231,8 +233,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" );
- *
* @name get
* @type Array
* @cat Core
@@ -246,8 +246,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test cmpOK( $("div").get(0), "==", document.getElementById("main"), "Get A Single Element" );
- *
* @name get
* @type Element
* @param Number num Access the element in the Nth position.
@@ -308,14 +306,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var div = $("div");
- * div.each(function(){this.foo = 'zoo';});
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).foo != "zoo" ) pass = false;
- * }
- * ok( pass, "Execute a function, Relative" );
- *
* @name each
* @type jQuery
* @param Function fn A function to execute
@@ -342,16 +332,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result -1
*
- * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" );
- * ok( $([window, document]).index(document) == 1, "Check for index of elements" );
- * var inputElements = $('#radio1,#radio2,#check1,#check2');
- * ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );
- * ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );
- * ok( inputElements.index(window) == -1, "Check for not found index" );
- * ok( inputElements.index(document) == -1, "Check for not found index" );
- *
* @name index
* @type Number
* @param Object obj Object to search for
@@ -374,11 +354,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result test.jpg
*
- * @test ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
- * @test ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
- * @test ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
- * @test ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
- *
* @name attr
* @type Object
* @param String name The name of the property to access.
@@ -394,12 +369,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var pass = true;
- * $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
- * if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
- * });
- * ok( pass, "Set Multiple Attributes" );
- *
* @name attr
* @type jQuery
* @param Hash prop A set of key/value pairs to set as object properties.
@@ -413,14 +382,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var div = $("div");
- * div.attr("foo", "bar");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
- * }
- * ok( pass, "Set Attribute" );
- *
* @name attr
* @type jQuery
* @param String key The name of the property to set.
@@ -460,8 +421,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").css("color");
* @before
Test Paragraph.
* @result red
- *
- * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"');
+ * @desc Retrieves the color style of the first paragraph
+ *
+ * @example $("p").css("fontWeight");
+ * @before
Test Paragraph.
+ * @result bold
+ * @desc Retrieves the font-weight style of the first paragraph.
+ * Note that for all style properties with a dash (like 'font-weight'), you have to
+ * write it in camelCase. In other words: Every time you have a '-' in a
+ * property, remove it and replace the next character with an uppercase
+ * representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth,
+ * borderStyle, borderBottomWidth etc.
*
* @name css
* @type Object
@@ -478,12 +448,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css({display: 'none'});
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css({display: 'block'});
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param Hash prop A set of key/value pairs to set as style properties.
@@ -496,12 +460,7 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").css("color","red");
* @before
Test Paragraph.
* @result
Test Paragraph.
- *
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css('display', 'none');
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css('display', 'block');
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+ * @desc Changes the color of all paragraphs to red
*
* @name css
* @type jQuery
@@ -522,9 +481,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result Test Paragraph.
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's Weblog";
- * ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );
- *
* @name text
* @type String
* @cat DOM
@@ -553,15 +509,13 @@ jQuery.fn = jQuery.prototype = {
* and finds the deepest ancestor element within its
* structure - it is that element that will en-wrap everything else.
*
+ * This does not work with elements that contain text. Any necessary text
+ * must be added after the wrapping is done.
+ *
* @example $("p").wrap("");
* @before
Test Paragraph.
* @result
Test Paragraph.
- *
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap('
xxyy
').text()
- * ok( 'xx' + defaultText + 'yy' == result, 'Check for wrapping' );
- * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper div has class "red"' );
- *
+ *
* @name wrap
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and wrapped around the target.
@@ -578,9 +532,12 @@ jQuery.fn = jQuery.prototype = {
* provided and finding the deepest ancestor element within its
* structure - it is that element that will en-wrap everything else.
*
- * @example $("p").wrap("");
- * @before
Test Paragraph.
- * @result
Test Paragraph.
+ * This does not work with elements that contain text. Any necessary text
+ * must be added after the wrapping is done.
+ *
+ * @example $("p").wrap( document.getElementById('content') );
+ * @before
Test Paragraph.
+ * @result
Test Paragraph.
*
* @name wrap
* @type jQuery
@@ -599,7 +556,7 @@ jQuery.fn = jQuery.prototype = {
// Insert it before the element to be wrapped
this.parentNode.insertBefore( b, this );
- // Find he deepest point in the wrap structure
+ // Find the deepest point in the wrap structure
while ( b.firstChild )
b = b.firstChild;
@@ -618,10 +575,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
I would like to say: Hello
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').append('buga');
- * ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
- *
* @name append
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -637,10 +590,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
- * $('#sap').append(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for appending of element" );
- *
* @name append
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -656,10 +605,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
- * $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for appending of array of elements" );
- *
* @name append
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -681,10 +626,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
HelloI would like to say:
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').prepend('buga');
- * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
- *
* @name prepend
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -700,10 +641,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
*
- * @test var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for prepending of element" );
- *
* @name prepend
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -719,10 +656,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
*
- * @test var expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
- *
* @name prepend
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -742,10 +675,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result Hello
I would like to say:
*
- * @test var expected = 'This is a normal link: bugaYahoo';
- * $('#yahoo').before('buga');
- * ok( expected == $('#en').text(), 'Insert String before' );
- *
* @name before
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -759,10 +688,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
*
- * @test var expected = "This is a normal link: Try them out:Yahoo";
- * $('#yahoo').before(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element before" );
- *
* @name before
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -776,10 +701,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
*
- * @test var expected = "This is a normal link: Try them out:diveintomarkYahoo";
- * $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements before" );
- *
* @name before
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -799,10 +720,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = 'This is a normal link: Yahoobuga';
- * $('#yahoo').after('buga');
- * ok( expected == $('#en').text(), 'Insert String after' );
- *
* @name after
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -816,10 +733,6 @@ jQuery.fn = jQuery.prototype = {
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = "This is a normal link: YahooTry them out:";
- * $('#yahoo').after(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element after" );
- *
* @name after
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -833,10 +746,6 @@ jQuery.fn = jQuery.prototype = {
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = "This is a normal link: YahooTry them out:diveintomark";
- * $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements after" );
- *
* @name after
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -857,13 +766,13 @@ jQuery.fn = jQuery.prototype = {
* @before
]
*
- * @test var div = $("div");
- * div.addClass("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
- * }
- * ok( pass, "Add Class" );
- *
* @name addClass
* @type jQuery
* @param String class A CSS class to add to the elements
@@ -2995,14 +2909,6 @@ jQuery.macros = {
* @before
Hello
* @result [
Hello
]
*
- * @test var div = $("div").addClass("test");
- * div.removeClass("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).className.indexOf("test") != -1 ) pass = false;
- * }
- * ok( pass, "Remove Class" );
- *
* @name removeClass
* @type jQuery
* @param String class A CSS class to remove from the elements
@@ -3013,8 +2919,8 @@ jQuery.macros = {
},
/**
- * Adds the specified class if it is present, removes it if it is
- * not present.
+ * Adds the specified class if it is not present, removes it if it is
+ * present.
*
* @example $("p").toggleClass("selected")
* @before
Hello
Hello Again
@@ -3078,24 +2984,31 @@ jQuery.macros = {
},
/**
- * Binds a particular event (like click) to a each of a set of match elements.
- *
- * @example $("p").bind( "click", function() { alert("Hello"); } )
+ * Binds a handler to a particular event (like click) for each matched element.
+ * The event handler is passed an event object that you can use to prevent
+ * default behaviour. To stop both default action and event bubbling, your handler
+ * has to return false.
+ *
+ * @example $("p").bind( "click", function() {
+ * alert( $(this).text() );
+ * } )
* @before
Hello
- * @result [
Hello
]
- *
- * Cancel a default action and prevent it from bubbling by returning false
- * from your function.
+ * @result alert("Hello")
*
* @example $("form").bind( "submit", function() { return false; } )
+ * @desc Cancel a default action and prevent it from bubbling by returning false
+ * from your function.
*
- * Cancel a default action by using the preventDefault method.
- *
- * @example $("form").bind( "submit", function() { e.preventDefault(); } )
+ * @example $("form").bind( "submit", function(event) {
+ * event.preventDefault();
+ * } );
+ * @desc Cancel only the default action by using the preventDefault method.
*
- * Stop an event from bubbling by using the stopPropogation method.
*
- * @example $("form").bind( "submit", function() { e.stopPropogation(); } )
+ * @example $("form").bind( "submit", function(event) {
+ * event.stopPropagation();
+ * } )
+ * @desc Stop only an event from bubbling by using the stopPropagation method.
*
* @name bind
* @type jQuery
@@ -3104,8 +3017,6 @@ jQuery.macros = {
* @cat Events
*/
bind: function( type, fn ) {
- if ( fn.constructor == String )
- fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
jQuery.event.add( this, type, fn );
},