X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=jquery%2Fjquery.js;h=7fd11462a683e7baa71fab228ee49407abaf9940;hb=2d31381a5722719190be4a0dde630a0b9ea70fa5;hp=a9ab3045139140f7a162b530124a0ab9153b17a6;hpb=9477c418dbf50f2341dec7c02f60ab3d77da5378;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index a9ab304..7fd1146 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -19,8 +19,8 @@ window.undefined = window.undefined; function jQuery(a,c) { // Shortcut for document ready (because $(document).each() is silly) - if ( a && a.constructor == Function ) - return $(document).ready(a); + if ( a && a.constructor == Function && jQuery.fn.ready ) + return jQuery(document).ready(a); // Make sure t hat a selection was provided a = a || jQuery.context || document; @@ -29,7 +29,7 @@ function jQuery(a,c) { * Handle support for overriding other $() functions. Way too many libraries * provide this function to simply ignore it and overwrite it. */ - + /* // Check to see if this is a possible collision case if ( jQuery._$ && !c && a.constructor == String && @@ -42,6 +42,7 @@ function jQuery(a,c) { // Use the default method, in case it works some voodoo return jQuery._$( a ); + */ // Watch for when a jQuery object is passed as the selector if ( a.jquery ) @@ -49,16 +50,20 @@ function jQuery(a,c) { // Watch for when a jQuery object is passed at the context if ( c && c.jquery ) - return $(c.get()).find(a); + return jQuery(c.get()).find(a); // If the context is global, return a new object if ( window == this ) return new jQuery(a,c); + // Handle HTML strings + var m = /^[^<]*(<.+>)[^>]*$/.exec(a); + if ( m ) a = jQuery.clean( [ m[1] ] ); + // Watch for when an array is passed in - this.get( a.constructor == Array ? + this.get( a.constructor == Array || a.length && a[0] != undefined && a[0].nodeType ? // Assume that it's an array of DOM Elements - a : + jQuery.merge( a, [] ) : // Find the matching elements and save them for later jQuery.find( a, c ) ); @@ -152,7 +157,7 @@ jQuery.fn = jQuery.prototype = { 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; @@ -168,7 +173,7 @@ jQuery.fn = jQuery.prototype = { // Return just the object this[num]; }, - + /** * Execute a function within the context of every matched element. * This means that every time the passed-in function is executed @@ -187,12 +192,12 @@ jQuery.fn = jQuery.prototype = { * @type jQuery * @param Function fn A function to execute */ - each: function( fn ) { + each: function( fn, args ) { // Iterate through all of the matched elements for ( var i = 0; i < this.length; i++ ) // Execute the function within the context of each element - fn.apply( this[i], [i] ); + fn.apply( this[i], args || [i] ); return this; }, @@ -303,7 +308,7 @@ jQuery.fn = jQuery.prototype = { * @param Object value The value to set the property to. */ css: function( key, value ) { - return this.attr( key, value, "css" ); + return this.attr( key, value, "curCSS" ); }, /** @@ -478,7 +483,7 @@ jQuery.fn = jQuery.prototype = { * elements with which to process. * * All searching is done using a jQuery expression. The expression can be - * written using CSS 1-3 Selector sytax, or basic XPath. + * written using CSS 1-3 Selector syntax, or basic XPath. * * @example $("p").find("span"); * @before
Hello, how are you?
@@ -494,24 +499,128 @@ jQuery.fn = jQuery.prototype = { }), arguments ); }, + /** + * Removes all elements from the set of matched elements that do not + * match the specified expression. This method is used to narrow down + * the results of a search. + * + * All searching is done using a jQuery expression. The expression + * can be written using CSS 1-3 Selector syntax, or basic XPath. + * + * @example $("p").filter(".selected") + * @beforeHello
How are you?
+ * @result $("p").filter(".selected") == [Hello
] + * + * @name filter + * @type jQuery + * @param String expr An expression to search with. + */ + + /** + * Removes all elements from the set of matched elements that do not + * match at least one of the expressions passed to the function. This + * method is used when you want to filter the set of matched elements + * through more than one expression. + * + * Elements will be retained in the jQuery object if they match at + * least one of the expressions passed. + * + * @example $("p").filter([".selected", ":first"]) + * @beforeHello
Hello Again
And Again
+ * @result $("p").filter([".selected", ":first"]) == [Hello
,And Again
] + * + * @name filter + * @type jQuery + * @param ArrayHello
Hello Again
+ * @result [Hello
] + * + * @name not + * @type jQuery + * @param Element el An element to remove from the set + */ + + /** + * Removes elements matching the specified expression from the set + * of matched elements. This method is used to remove one or more + * elements from a jQuery object. + * + * @example $("p").not("#selected") + * @beforeHello
Hello Again
+ * @result [Hello
] + * + * @name not + * @type jQuery + * @param String expr An expression with which to remove matching elements + */ not: function(t) { return this.pushStack( t.constructor == String ? jQuery.filter(t,this,false).r : jQuery.grep(this,function(a){ return a != t; }), arguments ); }, - + + /** + * Adds the elements matched by the expression to the jQuery object. This + * can be used to concatenate the result sets of two expressions. + * + * @example $("p").add("span") + * @beforeHello
Hello Again
+ * @result [Hello
, Hello Again ] + * + * @name add + * @type jQuery + * @param String expr An expression whose matched elements are added + */ + + /** + * Adds each of the Elements in the array to the set of matched elements. + * This is used to add a set of Elements to a jQuery object. + * + * @example $("p").add([document.getElementById("a"), document.getElementById("b")]) + * @beforeHello
Hello AgainAnd Again
+ * @result [Hello
, Hello Again, And Again ] + * + * @name add + * @type jQuery + * @param ArrayHello
Hello Again
+ * @result [Hello
, Hello Again ] + * + * @name add + * @type jQuery + * @param Element el An Element to add + */ add: function(t) { return this.pushStack( jQuery.merge( this, t.constructor == String ? jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments ); @@ -527,7 +636,7 @@ jQuery.fn = jQuery.prototype = { * @type Boolean */ is: function(expr) { - return jQuery.filter(expr,this).r.length > 0; + return expr ? jQuery.filter(expr,this).r.length > 0 : this.length > 0; }, /** @@ -557,10 +666,12 @@ jQuery.fn = jQuery.prototype = { } else obj = tbody[0]; } - + //alert( obj ); for ( var i = ( dir < 0 ? a.length - 1 : 0 ); - i != ( dir < 0 ? dir : a.length ); i += dir ) - fn.apply( obj, [ a[i] ] ); + i != ( dir < 0 ? dir : a.length ); i += dir ) { + fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] ); + //alert( fn ); + } }); }, @@ -591,7 +702,11 @@ jQuery.fn = jQuery.prototype = { return this; }, - extend: function(obj,prop) { if ( !prop ) { prop = obj; obj = this; } for ( var i in prop ) obj[i] = prop[i]; return obj; } + 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; @@ -611,11 +726,147 @@ new function() { jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat"; var axis = { + /** + * Get a set of elements containing the unique parents of the matched + * set of elements. + * + * @example $("p").parent() + * @beforeHello
Hello
Hello
Hello
Hello
Hello Again
Hello Again
Hello
Hello AgainHello
] + * + * @name ancestors + * @type jQuery + */ + + /** + * 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 + */ ancestors: jQuery.parents, - next: "a.nextSibling", - prev: "a.previousSibling", + + /** + * A synonym for ancestors + */ + parents: jQuery.parents, + + /** + * Get a set of elements containing the unique next siblings of each of the + * matched set of elements. + * + * It only returns the very next sibling, not all next siblings. + * + * @example $("p").next() + * @beforeHello
Hello Again
Hello Again
,Hello
Hello Again
Hello Again
] + * + * @name next + * @type jQuery + * @param String expr An expression to filter the next Elements with + */ + next: "jQuery.sibling(a).next", + + /** + * Get a set of elements containing the unique previous siblings of each of the + * matched set of elements. + * + * It only returns the immediately previous sibling, not all previous siblings. + * + * @example $("p").previous() + * @beforeHello
And Again
+ * @result [Hello Again
And Again
+ * @result [Hello
And Again
+ * @result [Hello
,And Again
] + * + * @name siblings + * @type jQuery + */ + + /** + * Get a set of elements containing all of the unique siblings of each of the + * matched set of elements, and filtered by an expression. + * + * @example $("div").siblings("selected") + * @beforeHello Again
And Again
+ * @result [Hello Again
] + * + * @name siblings + * @type jQuery + * @param String expr An expression to filter the sibling Elements with + */ siblings: jQuery.sibling }; @@ -623,12 +874,15 @@ new function() { var t = axis[i]; jQuery.fn[ i ] = function(a) { var ret = jQuery.map(this,t); - if ( a ) ret = jQuery.filter(a,ret).r; + if ( a && a.constructor == String ) + ret = jQuery.filter(a,ret).r; return this.pushStack( ret, arguments ); }; - } + }; + + // appendTo, prependTo, beforeTo, afterTo - /*var to = ["append","prepend","before","after"]; + var to = ["append","prepend","before","after"]; for ( var i = 0; i < to.length; i++ ) new function(){ var n = to[i]; @@ -639,15 +893,35 @@ new function() { $(a[i])[n]( this ); }); }; - }*/ + }; var each = { + /** + * Displays each of the set of matched elements if they are hidden. + * + * @example $("p").show() + * @before + * @result [Hello
] + * + * @name show + * @type jQuery + */ show: function(){ this.style.display = this.oldblock ? this.oldblock : ""; if ( jQuery.css(this,"display") == "none" ) this.style.display = "block"; }, - + + /** + * Hides each of the set of matched elements if they are shown. + * + * @example $("p").hide() + * @beforeHello
+ * @result [ ] + * + * @name hide + * @type jQuery + */ hide: function(){ this.oldblock = jQuery.css(this,"display"); if ( this.oldblock == "none" ) @@ -655,55 +929,164 @@ new function() { this.style.display = "none"; }, + /** + * Toggles each of the set of matched elements. If they are shown, + * toggle makes them hidden. If they are hidden, toggle + * makes them shown. + * + * @example $("p").toggle() + * @beforeHello
+ * @result [ ,Hello Again
] + * + * @name toggle + * @type jQuery + */ toggle: function(){ var d = jQuery.css(this,"display"); $(this)[ !d || d == "none" ? "show" : "hide" ](); }, + /** + * Adds the specified class to each of the set of matched elements. + * + * @example ("p").addClass("selected") + * @beforeHello
+ * @result [Hello
] + * + * @name addClass + * @type jQuery + * @param String class A CSS class to add to the elements + */ addClass: function(c){ jQuery.className.add(this,c); }, + /** + * The opposite of addClass. Removes the specified class from the + * set of matched elements. + * + * @example ("p").removeClass("selected") + * @beforeHello
+ * @result [Hello
] + * + * @name removeClass + * @type jQuery + * @param String class A CSS class to remove from the elements + */ removeClass: function(c){ jQuery.className.remove(this,c); }, + /** + * Adds the specified class if it is present. Remove it if it is + * not present. + * + * @example ("p").toggleClass("selected") + * @beforeHello
Hello Again
+ * @result [Hello
,Hello Again
] + * + * @name toggleClass + * @type jQuery + * @param String class A CSS class with which to toggle the elements + */ toggleClass: function( c ){ - jQuery.className[ jQuery.className.has(this,a) ? "remove" : "add" ](this,c); + jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this,c); }, + /** + * TODO: Document + */ remove: function(a){ if ( !a || jQuery.filter( [this], a ).r ) this.parentNode.removeChild( this ); }, + /** + * Removes all child nodes from the set of matched elements. + * + * @example ("p").empty() + * @beforeHello, Person and person
+ * @result [ ] + * + * @name empty + * @type jQuery + */ empty: function(){ while ( this.firstChild ) this.removeChild( this.firstChild ); }, + /** + * Binds a particular event (like click) to a each of a set of match elements. + * + * @example $("p").bind( "click", function() { alert("Hello"); } ) + * @beforeHello
+ * @result [Hello
] + * + * Cancel a default action and prevent it from bubbling by returning false + * from your function. + * + * @example $("form").bind( "submit", function() { return false; } ) + * + * Cancel a default action by using the preventDefault method. + * + * @example $("form").bind( "submit", function() { e.preventDefault(); } ) + * + * Stop an event from bubbling by using the stopPropogation method. + * + * @example $("form").bind( "submit", function() { e.stopPropogation(); } ) + * + * @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 + */ bind: function( type, fn ) { + if ( fn.constructor == String ) + fn = new Function("e", ( !fn.indexOf(".") ? "$(this)" : "return " ) + fn); jQuery.event.add( this, type, fn ); }, + /** + * The opposite of bind. Removes a bound event from each of a set of 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 + */ unbind: function( type, fn ) { jQuery.event.remove( this, type, fn ); }, - trigger: function( type ) { - jQuery.event.trigger( this, type ); + /** + * Trigger a particular event. + * + * @example $("p").trigger("click") + * @beforeHello
+ * @result [Hello
] + * + * @name trigger + * @type jQuery + * @param String type An event type + */ + trigger: function( type, data ) { + jQuery.event.trigger( type, data, this ); } }; for ( var i in each ) new function() { var n = each[i]; jQuery.fn[ i ] = function() { - var args = arguments; - return this.each(function(){ - n.apply( this, args ); - }); + return this.each( n, arguments ); }; - } + }; var attr = { val: "value", @@ -718,24 +1101,24 @@ new function() { }; for ( var i in attr ) new function() { - var n = attr[i]; + var n = attr[i] || i; jQuery.fn[ i ] = function(h) { return h == undefined ? this.length ? this[0][n] : null : this.attr( n, h ); }; - } - - var css = "width,height,top,left,position,float,overflow,color,background".split(","); - + }; + + var css = "width,height,top,left,position,float,overflow,color,background".split(","); + for ( var i in css ) new function() { var n = css[i]; jQuery.fn[ i ] = function(h) { return h == undefined ? - this.length ? jQuery.css( this[0], n ) : null : + ( this.length ? jQuery.css( this[0], n ) : null ) : this.css( n, h ); }; - } + }; } @@ -794,7 +1177,11 @@ jQuery.extend({ return p == "height" ? oHeight : oWidth; } - + + return jQuery.curCSS( e, p ); + }, + + curCSS: function(e,p) { var r; if (e.style[p]) @@ -869,8 +1256,8 @@ jQuery.extend({ contains: "(a.innerText||a.innerHTML).indexOf(m[3])>=0", // Visibility - visible: "jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'", - hidden: "jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'", + visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'", + hidden: "a.type=='hidden'||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'", // Form elements enabled: "!a.disabled", @@ -905,7 +1292,7 @@ jQuery.extend({ find: function( t, context ) { // Make sure that the context is a DOM Element - if ( context && context.getElementsByTagName == undefined ) + if ( context && context.nodeType == undefined ) context = null; // Set the correct context (if none is provided) @@ -1022,50 +1409,53 @@ jQuery.extend({ } else return ""; }, + + // The regular expressions that power the parsing engine + parse: [ + // Match: [@value='test'], [@foo] + [ "\\[ *(@)S *([!*$^=]*) *Q\\]", 1 ], + + // Match: [div], [div p] + [ "(\\[)Q\\]", 0 ], + + // Match: :contains('foo') + [ "(:)S\\(Q\\)", 0 ], + + // Match: :even, :last-chlid + [ "([:.#]*)S", 0 ] + ], filter: function(t,r,not) { // Figure out if we're doing regular, or inverse, filtering var g = not !== false ? jQuery.grep : function(a,f) {return jQuery.grep(a,f,true);}; - // Look for a string-like sequence - var str = "([a-zA-Z*_-][a-zA-Z0-9_-]*)"; - - // Look for something (optionally) enclosed with quotes - var qstr = " *'?\"?([^'\"]*)'?\"? *"; - - while ( t && /^[a-zA-Z\[*:.#]/.test(t) ) { - // Handles: - // [@foo], [@foo=bar], etc. - var re = new RegExp("^\\[ *@" + str + " *([!*$^=]*) *" + qstr + "\\]"); - var m = re.exec(t); - - // Re-organize the match - if ( m ) m = ["", "@", m[2], m[1], m[3]]; - - // Handles: - // [div], [.foo] - if ( !m ) { - re = new RegExp("^(\\[)" + qstr + "\\]"); - m = re.exec(t); - } - - // Handles: - // :contains(test), :not(.foo) - if ( !m ) { - re = new RegExp("^(:)" + str + "\\(" + qstr + "\\)"); - m = re.exec(t); - } - - // Handles: - // :foo, .foo, #foo, foo - if ( !m ) { - re = new RegExp("^([:.#]*)" + str); - m = re.exec(t); + while ( t && /^[a-z[({<*:.#]/i.test(t) ) { + + var p = jQuery.parse; + + for ( var i = 0; i < p.length; i++ ) { + var re = new RegExp( "^" + p[i][0] + + // Look for a string-like sequence + .replace( 'S', "([a-z*_-][a-z0-9_-]*)" ) + + // Look for something (optionally) enclosed with quotes + .replace( 'Q', " *'?\"?([^'\"]*)'?\"? *" ), "i" ); + + var m = re.exec( t ); + + if ( m ) { + // Re-organize the match + if ( p[i][1] ) + m = ["", m[1], m[3], m[2], m[4]]; + + // Remove what we just matched + t = t.replace( re, "" ); + + break; + } } - - // Remove what we just matched - t = t.replace( re, "" ); // :not() is a special case that can be optomized by // keeping it out of the expression list @@ -1145,6 +1535,7 @@ jQuery.extend({ n == "even" && type.n % 2 == 0 || n == "odd" && type.n % 2 || type[n] == a; + type.prev = type[type.n - 1]; type.next = type[type.n + 1]; return type; }, @@ -1281,7 +1672,7 @@ jQuery.extend({ if (element["on" + type]) handlers[0] = element["on" + type]; } - + // Add the function to the element's handler list handlers[handler.guid] = handler; @@ -1339,9 +1730,11 @@ jQuery.extend({ if ( !event ) return; var returnValue = true; + + var c = this.events[event.type]; - for ( var j in this.events[event.type] ) { - if (this.events[event.type][j](event) === false) { + for ( var j in c ) { + if ( c[j].apply( this, [event] ) === false ) { event.preventDefault(); event.stopPropagation(); returnValue = false; @@ -1366,4 +1759,4 @@ jQuery.extend({ } } -}); \ No newline at end of file +});