X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=282741fd75941ea72bce48bb51688d960c7552f3;hb=2daf49296abd4fcdf526a2c2814cd24e8f3eaff0;hp=af729695b92db3245847fd53de115d1e2b7447aa;hpb=cc5f46454fbf34ae8a8e526a621cab55e1c79cdb;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index af72969..282741f 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -21,13 +21,13 @@ window.undefined = window.undefined; * @cat Core */ var jQuery = function(a,c) { - - // Shortcut for document ready - if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function - return jQuery(document).ready(a); - // Make sure that a selection was provided a = a || 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 ) @@ -48,21 +48,12 @@ var jQuery = function(a,c) { } // Watch for when an array is passed in - this.set( a.constructor == Array || a.length && a != window && !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.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); - - return this; }; // Map over the $ in case of overwrite @@ -162,6 +153,8 @@ var $ = jQuery; * 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 * }); @@ -227,6 +220,8 @@ jQuery.fn = jQuery.prototype = { size: function() { return this.length; }, + + length: 0, /** * Access all matched elements. This serves as a backwards-compatible @@ -266,7 +261,8 @@ jQuery.fn = jQuery.prototype = { }, /** - * Set the jQuery object to an array of elements. + * Set the jQuery object to an array of elements, while maintaining + * the stack. * * @example $("img").set([ document.body ]); * @result $("img").set() == [ document.body ] @@ -277,11 +273,29 @@ jQuery.fn = jQuery.prototype = { * @param Elements elems An array of elements * @cat Core */ - set: function( array ) { - // Use a tricky hack to make the jQuery object - // look and feel like an array + 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, array ); + [].push.apply( this, a ); return this; }, @@ -298,8 +312,8 @@ jQuery.fn = jQuery.prototype = { * @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 @@ -357,7 +371,8 @@ jQuery.fn = jQuery.prototype = { */ /** - * 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. * @@ -367,7 +382,7 @@ jQuery.fn = jQuery.prototype = { * * @name attr * @type jQuery - * @param Hash prop A set of key/value pairs to set as object properties. + * @param Map properties Key/value pairs to set as object properties. * @cat DOM */ @@ -375,7 +390,7 @@ 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 + * Use $(html) or .append(html) or .html(html) to create elements * on the fly including the name property. * * @example $("img").attr("src","test.jpg"); @@ -440,7 +455,8 @@ jQuery.fn = jQuery.prototype = { */ /** - * 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. * @@ -450,7 +466,7 @@ jQuery.fn = jQuery.prototype = { * * @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 */ @@ -485,12 +501,32 @@ jQuery.fn = jQuery.prototype = { * @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.
+ * @resultSome 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] ]); @@ -566,8 +602,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. * @@ -575,40 +611,21 @@ jQuery.fn = jQuery.prototype = { * @beforeI would like to say:
* @resultI would like to say: Hello
* - * @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] ); * @beforeI would like to say:
Hello * @resultI would like to say: Hello
* - * @name append - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Append any number of elements to the inside of all matched elements. - * This operation is similar to doing an appendChild to all the - * specified elements, adding them into the document. - * * @example $("p").append( $("b") ); * @beforeI would like to say:
Hello * @resultI would like to say: Hello
* * @name append * @type jQuery - * @param ArrayI would like to say:
* @resultHelloI would like to say:
* - * @name prepend - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Prepend an element to the inside of all matched elements. - * This operation is the best way to insert an element inside, at the - * beginning, of all the matched element. - * * @example $("p").prepend( $("#foo")[0] ); * @beforeI would like to say:
Hello * @resultHelloI would like to say:
- * - * @name prepend - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Prepend any number of elements to the inside of all matched elements. - * This operation is the best way to insert a set of elements inside, at the - * beginning, of all the matched element. - * + * * @example $("p").prepend( $("b") ); * @beforeI would like to say:
Hello * @resultHelloI would like to say:
* * @name prepend * @type jQuery - * @param ArrayI would like to say:
* @result HelloI would like to say:
* - * @name before - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Insert an element before each of the matched elements. - * * @example $("p").before( $("#foo")[0] ); * @beforeI would like to say:
Hello * @result HelloI would like to say:
* - * @name before - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Insert any number of elements before each of the matched elements. - * * @example $("p").before( $("b") ); * @beforeI would like to say:
Hello * @result HelloI would like to say:
* * @name before * @type jQuery - * @param ArrayI would like to say:
* @resultI would like to say:
Hello * - * @name after - * @type jQuery - * @param String html A string of HTML, that will be created on the fly and appended to the target. - * @cat DOM/Manipulation - */ - - /** - * Insert an element after each of the matched elements. - * * @example $("p").after( $("#foo")[0] ); * @before HelloI would like to say:
* @resultI would like to say:
Hello * - * @name after - * @type jQuery - * @param Element elem A DOM element that will be appended. - * @cat DOM/Manipulation - */ - - /** - * Insert any number of elements after each of the matched elements. - * * @example $("p").after( $("b") ); * @before HelloI would like to say:
* @resultI would like to say:
Hello * * @name after * @type jQuery - * @param ArrayHello, how are you?
* @result $("p").find("span").end() == [...
] @@ -771,9 +739,7 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ end: function() { - if( !(this.stack && this.stack.length) ) - return this; - return this.set( this.stack.pop() ); + return this.prevObject || jQuery([]); }, /** @@ -794,9 +760,9 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ find: function(t) { - return this.pushStack( jQuery.map( this, function(a){ + return this.set( jQuery.map( this, function(a){ return jQuery.find(t,a); - }), arguments ); + }) ); }, /** @@ -815,9 +781,9 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Manipulation */ clone: function(deep) { - return this.pushStack( jQuery.map( this, function(a){ + return this.set( jQuery.map( this, function(a){ return a.cloneNode( deep != undefined ? deep : true ); - }), arguments ); + }) ); }, /** @@ -830,13 +796,34 @@ jQuery.fn = jQuery.prototype = { * * @example $("p").filter(".selected") * @beforeHello
How are you?
- * @result $("p").filter(".selected") == [Hello
] + * @result [Hello
] * * @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; + * }) + * @beforeHow 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 @@ -849,7 +836,7 @@ jQuery.fn = jQuery.prototype = { * * @example $("p").filter([".selected", ":first"]) * @beforeHello
Hello Again
And Again
- * @result $("p").filter([".selected", ":first"]) == [Hello
,And Again
] + * @result [Hello
,And Again
] * * @name filter * @type jQuery @@ -857,10 +844,10 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ filter: function(t) { - return this.pushStack( + return this.set( t.constructor == Array && jQuery.map(this,function(a){ - for ( var i = 0; i < t.length; i++ ) + for ( var i = 0, tl = t.length; i < tl; i++ ) if ( jQuery.filter(t[i],[a]).r.length ) return a; return null; @@ -872,7 +859,7 @@ jQuery.fn = jQuery.prototype = { typeof t == "function" && jQuery.grep( this, t ) || - jQuery.filter(t,this).r, arguments ); + jQuery.filter(t,this).r ); }, /** @@ -904,9 +891,9 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ not: function(t) { - return this.pushStack( typeof t == "string" ? + return this.set( typeof t == "string" ? jQuery.filter(t,this,true).r : - jQuery.grep(this,function(a){ return a != t; }), arguments ); + jQuery.grep(this,function(a){ return a != t; }) ); }, /** @@ -951,10 +938,10 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ add: function(t) { - return this.pushStack( jQuery.merge( + return this.set( jQuery.merge( this.get(), typeof t == "string" ? jQuery.find(t) : - t.constructor == Array ? t : [t] ), arguments ); + t.constructor == Array ? t : [t] ) ); }, /** @@ -1008,44 +995,10 @@ jQuery.fn = jQuery.prototype = { if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" ) obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody")); - for ( var i=0; i < a.length; i++ ) + for ( var i = 0, al = a.length; i < al; i++ ) fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] ); }); - }, - - /** - * - * - * @private - * @name pushStack - * @param Array a - * @param Array args - * @type jQuery - * @cat Core - */ - pushStack: function(a,args) { - var fn = args && args.length > 1 && args[args.length-1]; - var fn2 = args && args.length > 2 && args[args.length-2]; - - if ( fn && fn.constructor != Function ) fn = null; - if ( fn2 && fn2.constructor != Function ) fn2 = null; - - if ( !fn ) { - if ( !this.stack ) this.stack = []; - this.stack.push( this.get() ); - this.set( a ); - } else { - var old = this.get(); - this.set( a ); - - if ( fn2 && a.length || !fn2 ) - this.each( fn2 || fn ).set( old ); - else - this.set( old ).each( fn ); - } - - return this; } }; @@ -1134,7 +1087,7 @@ jQuery.extend({ var ret = jQuery.map(this,n); if ( a && typeof a == "string" ) ret = jQuery.filter(a,ret).r; - return this.pushStack( ret, arguments ); + return this.set( ret ); }; }); @@ -1142,7 +1095,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 ); }); }; @@ -1207,34 +1160,26 @@ jQuery.extend({ for ( var i in obj ) 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; iHello
Hello AgainHello
] - * - * @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") - * @beforeHello
Hello AgainHello
] - * - * @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() * @beforeHello
Hello AgainHello
] * @@ -2857,7 +2218,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") * @beforeHello
Hello AgainHello
] * @@ -3083,15 +2444,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() * @beforeHello
* @result [Hello
] * + * @example $("p").removeClass("selected") + * @beforeHello
+ * @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){ @@ -3161,106 +2526,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() ); - * } ) - * @beforeHello
- * @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 ) { - 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"); } ) - * @beforeHello
- * @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" ) - * @beforeHello
- * @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() - * @beforeHello
- * @result [Hello
] - * - * @name unbind - * @type jQuery - * @cat Events - */ - unbind: function( type, fn ) { - jQuery.event.remove( this, type, fn ); - }, - - /** - * Trigger a type of event on every matched element. - * - * @example $("p").trigger("click") - * @beforeHello
- * @result alert('hello') - * - * @name trigger - * @type jQuery - * @param String type An event type to trigger. - * @cat Events - */ - trigger: function( type, data ) { - jQuery.event.trigger( type, data, this ); } } }; -jQuery.init(); +jQuery.init(); \ No newline at end of file