X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=dad8e6d27c2da2f59b010b4944685630f0ddacdd;hb=e2c2a9392e14f4190148b3c8014fdccf66785b88;hp=7577936580e49ec4de4d588e286fe9409c4cdfd2;hpb=9e27d8d1b4d5a93ef4107aab5e815a2c24ed899d;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 7577936..dad8e6d 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -1,7 +1,7 @@ /* - * jQuery (jquery.com) + * jQuery - New Wave Javascript * - * Copyright (c) 2006 John Resig (ejohn.org) + * Copyright (c) 2006 John Resig (jquery.com) * Licensed under the MIT License: * http://www.opensource.org/licenses/mit-license.php * @@ -9,320 +9,420 @@ * $Rev$ */ -/* For JSLint (jslint.com): */ -/*extern ActiveXObject Prototype setTimeout setInterval clearInterval document window XMLHttpRequest navigator*/ - -function $(a,c) { - var $a = a || $.context || document; - var $c = c && c.$jquery && c.get(0) || c; - - // Since we're using Prototype's $ function, - // be nice and have backwards compatability - if ( typeof Prototype != "undefined" ) { - if ( $a.constructor == String ) { - var re = new RegExp( "[^a-zA-Z0-9_-]" ); - if ( !re.test($a) ) { - $c = $c && $c.documentElement || document; - if ( $c.getElementsByTagName($a).length === 0 ) { - var obj = $c.getElementById($a); - if ( obj ) { return obj; } - } - } - } else if ( $a.constructor == Array ) { - return $.map( $a, function(b){ - if ( b.constructor == String ) { - return document.getElementById(b); - } - return b; - }); - } - } +// Global undefined variable +window.undefined = window.undefined; - // Load Dynamic Function List - var self = { - cur: $.Select($a,$c), - $jquery: "$Rev$", - - // The only two getters - size: function() {return this.get().length;}, - get: function(i) { - return typeof i == 'undefined' ? this.cur : this.cur[i]; - }, - - each: function(f) { - for ( var i = 0; i < this.size(); i++ ) { - $.apply( this.get(i), f, [i] ); - } - return this; - }, - set: function(a,b) { - return this.each(function(){ - if ( typeof b == 'undefined' ) { - for ( var j in a ) { - $.attr(this,j,a[j]); - } - } else { - $.attr(this,a,b); - } - }); - }, - html: function(h) { - return typeof h == 'undefined' && this.size() ? - this.get(0).innerHTML : this.set( "innerHTML", h ); - }, - val: function(h) { - return typeof h == 'undefined' && this.size() ? - this.get(0).value : this.set( "value", h ); - }, - - css: function(a,b) { - return a.constructor != String || b ? - this.each(function(){ - if ( !b ) { - for ( var j in a ) { - $.attr(this.style,j,a[j]); - } - } else { - $.attr(this.style,a,b); - } - }) : $.css( this.get(0), a ); - }, - toggle: function() { - return this.each(function(){ - var d = $.getCSS(this,"display"); - if ( d == "none" || d === '' ) { - $(this).show(); - } else { - $(this).hide(); - } - }); - }, - show: function(a) { - return this.each(function(){ - this.style.display = this.$$oldblock ? this.$$oldblock : ''; - if ( $.getCSS(this,"display") == "none" ) { - this.style.display = 'block'; - } - }); - }, - hide: function(a) { - return this.each(function(){ - this.$$oldblock = $.getCSS(this,"display"); - if ( this.$$oldblock == "none" ) { - this.$$oldblock = 'block'; - } - this.style.display = 'none'; - }); - }, - addClass: function(c) { - return this.each(function(){ - if ($.hasWord(this,c)) { - return null; - } - this.className += ( this.className.length > 0 ? " " : "" ) + c; - }); - }, - removeClass: function(c) { - return this.each(function(){ - this.className = !c ? '' : - this.className.replace( - new RegExp('(^|\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), ''); - }); - }, - // TODO: Optomize - toggleClass: function(c) { - return this.each(function(){ - if ($.hasWord(this,c)) { - this.className = - this.className.replace( - new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), ''); - } else { - this.className += ( this.className.length > 0 ? " " : "" ) + c; - } - }); - }, - remove: function() { - this.each(function(){this.parentNode.removeChild( this );}); - this.cur = []; - return this; - }, - - wrap: function() { - var a = $.clean(arguments); - return this.each(function(){ - var b = a[0].cloneNode(true); - this.parentNode.insertBefore( b, this ); - while ( b.firstChild ) { - b = b.firstChild; - } - b.appendChild( this ); - }); - }, - - append: function() { - var clone = this.size() > 1; - var a = $.clean(arguments); - return this.each(function(){ - for ( var i = 0; i < a.length; i++ ) { - this.appendChild( clone ? a[i].cloneNode(true) : a[i] ); - } - }); - }, - - appendTo: function() { - var a = arguments; - return this.each(function(){ - for ( var i = 0; i < a.length; i++ ) { - $(a[i]).append( this ); - } - }); - }, - - prepend: function() { - var clone = this.size() > 1; - var a = $.clean(arguments); - return this.each(function(){ - for ( var i = a.length - 1; i >= 0; i-- ) { - this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild ); - } - }); - }, - - before: function() { - var clone = this.size() > 1; - var a = $.clean(arguments); - return this.each(function(){ - for ( var i = 0; i < a.length; i++ ) { - this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this ); - } - }); - }, - - after: function() { - var clone = this.size() > 1; - var a = $.clean(arguments); - return this.each(function(){ - for ( var i = a.length - 1; i >= 0; i-- ) { - this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling ); - } - }); - }, +/** + * Create a new jQuery Object + * @constructor + */ +function jQuery(a,c) { + + // Shortcut for document ready (because $(document).each() is silly) + if ( a && a.constructor == Function ) + return $(document).ready(a); + + // Make sure t hat a selection was provided + a = a || jQuery.context || document; + + /* + * 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 && + + // Make sure that the expression is a colliding one + !/[^a-zA-Z0-9_-]/.test(a) && + + // and that there are no elements that match it + // (this is the one truly ambiguous case) + !document.getElementsByTagName(a).length ) + + // 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 ) + return a; + + // Watch for when a jQuery object is passed at the context + if ( c && c.jquery ) + return $(c.get()).find(a); + + // If the context is global, return a new object + if ( window == this ) + return new jQuery(a,c); - empty: function() { - return this.each(function(){ - while ( this.firstChild ) { - this.removeChild( this.firstChild ); - } - }); - }, - - bind: function(t,f) { - return this.each(function(){$.event.add(this,t,f);}); - }, - unbind: function(t,f) { - return this.each(function(){$.event.remove(this,t,f);}); - }, - trigger: function(t) { - return this.each(function(){$.event.trigger(this,t);}); - }, - - find: function(t) { - var old = [], ret = []; - this.each(function(){ - old[old.length] = this; - ret = $.merge( ret, $.Select(t,this) ); - }); - this.old = old; - this.cur = ret; - return this; - }, - end: function() { - this.cur = this.old; - return this; - }, - - parent: function(a) { - this.cur = $.map(this.cur,function(d){ - return d.parentNode; - }); - if ( a ) { - this.cur = $.filter(a,this.cur).r; - } - return this; - }, - - parents: function(a) { - this.cur = $.map(this.cur,$.parents); - if ( a ) { - this.cur = $.filter(a,this.cur).r; - } - return this; - }, - - siblings: function(a) { - // Incorrect, need to exclude current element - this.cur = $.map(this.cur,$.sibling); - if ( a ) { - this.cur = $.filter(a,this.cur).r; - } - return this; - }, - - filter: function(t) { - this.cur = $.filter(t,this.cur).r; - return this; - }, - not: function(t) { - this.cur = t.constructor == String ? - $.filter(t,this.cur,false).r : - $.grep(this.cur,function(a){return a != t;}); - return this; - }, - add: function(t) { - this.cur = $.merge( this.cur, t.constructor == String ? - $.Select(t) : t.constructor == Array ? t : [t] ); - return this; - }, - is: function(t) { - return $.filter(t,this.cur).r.length > 0; - }, - isNot: function(t) { - return !this.s(t); - } - }; + // Watch for when an array is passed in + this.get( a.constructor == Array ? + // Assume that it's an array of DOM Elements + a : + + // Find the matching elements and save them for later + jQuery.Select( a, c ) ); + + var fn = arguments[ arguments.length - 1 ]; + if ( fn && fn.constructor == Function ) + this.each(fn); +} + +// Map over the $ in case of overwrite +if ( $ ) + jQuery._$ = $; + +// Map the jQuery namespace to the '$' one +var $ = jQuery; + +jQuery.fn = jQuery.prototype = { + /** + * The current SVN version of jQuery. + * + * @private + * @type String + */ + jquery: "$Rev$", + + /** + * The number of elements currently matched. + * + * @type Number + */ + size: function() { + return this.length; + }, - // TODO: Remove need to return this - for ( var i in $.fn ) { - if ( self[i] !== null ) { - self["_"+i] = self[i]; + /** + * Access the elements matched. If a number is provided, + * the Nth element is returned, otherwise, an array of all + * matched items is returned. + * + * @type Array,DOMElement + */ + get: function(num) { + if ( num && num.constructor == Array ) { + this.length = 0; + [].push.apply( this, num ); + } else + return num == undefined ? + + // Return a 'clean' array + $.map( this, function(a){ return a } ) : + + // Return just the object + this[num]; + }, + + each: function(f) { + for ( var i = 0; i < this.size(); i++ ) + f.apply( this[i], [i] ); + return this; + }, + set: function(a,b) { + return this.each(function(){ + if ( b === undefined ) + for ( var j in a ) + jQuery.attr(this,j,a[j]); + else + jQuery.attr(this,a,b); + }); + }, + html: function(h) { + return h == undefined && this.size() ? + this[0].innerHTML : this.set( "innerHTML", h ); + }, + val: function(h) { + return h == undefined && this.size() ? + this[0].value : this.set( "value", h ); + }, + text: function(e) { + e = e || this; + var t = ""; + for ( var j = 0; j < e.length; j++ ) { + var r = e[j].childNodes; + for ( var i = 0; i < r.length; i++ ) + t += r[i].nodeType != 1 ? + r[i].nodeValue : jQuery.fn.text([ r[i] ]); } - self[i] = $.fn[i]; - } + return t; + }, + + css: function(a,b) { + return a.constructor != String || b ? + this.each(function(){ + if ( b === undefined ) + for ( var j in a ) + jQuery.attr(this.style,j,a[j]); + else + jQuery.attr(this.style,a,b); + }) : jQuery.css( this[0], a ); + }, + toggle: function() { + return this.each(function(){ + var d = jQuery.css(this,"display"); + if ( !d || d == "none" ) + $(this).show(); + else + $(this).hide(); + }); + }, + show: function() { + return this.each(function(){ + this.style.display = this.oldblock ? this.oldblock : ""; + if ( jQuery.css(this,"display") == "none" ) + this.style.display = "block"; + }); + }, + hide: function() { + return this.each(function(){ + this.oldblock = jQuery.css(this,"display"); + if ( this.oldblock == "none" ) + this.oldblock = "block"; + this.style.display = "none"; + }); + }, + addClass: function(c) { + return this.each(function(){ + jQuery.className.add(this,c); + }); + }, + removeClass: function(c) { + return this.each(function(){ + jQuery.className.remove(this,c); + }); + }, + + toggleClass: function(c) { + return this.each(function(){ + if (jQuery.hasWord(this,c)) + jQuery.className.remove(this,c); + else + jQuery.className.add(this,c); + }); + }, + remove: function() { + return this.each(function(){ + this.parentNode.removeChild( this ); + }); + }, + + wrap: function() { + var a = jQuery.clean(arguments); + return this.each(function(){ + var b = a[0].cloneNode(true); + this.parentNode.insertBefore( b, this ); + while ( b.firstChild ) + b = b.firstChild; + b.appendChild( this ); + }); + }, + + append: function() { + var clone = this.size() > 1; + var a = jQuery.clean(arguments); + return this.domManip(function(){ + for ( var i = 0; i < a.length; i++ ) + this.appendChild( clone ? a[i].cloneNode(true) : a[i] ); + }); + }, + + appendTo: function() { + var a = arguments; + return this.each(function(){ + for ( var i = 0; i < a.length; i++ ) + $(a[i]).append( this ); + }); + }, + + prepend: function() { + var clone = this.size() > 1; + var a = jQuery.clean(arguments); + return this.domManip(function(){ + for ( var i = a.length - 1; i >= 0; i-- ) + this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild ); + }); + }, + + before: function() { + var clone = this.size() > 1; + var a = jQuery.clean(arguments); + return this.each(function(){ + for ( var i = 0; i < a.length; i++ ) + this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this ); + }); + }, + + after: function() { + var clone = this.size() > 1; + var a = jQuery.clean(arguments); + return this.each(function(){ + for ( var i = a.length - 1; i >= 0; i-- ) + this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling ); + }); + }, + + empty: function() { + return this.each(function(){ + while ( this.firstChild ) + this.removeChild( this.firstChild ); + }); + }, + + bind: function(t,f) { + return this.each(function(){jQuery.event.add(this,t,f);}); + }, + unbind: function(t,f) { + return this.each(function(){jQuery.event.remove(this,t,f);}); + }, + trigger: function(t) { + return this.each(function(){jQuery.event.trigger(this,t);}); + }, - if ( typeof Prototype != "undefined" && $a.constructor != String ) { - if ( $c ) { - $a = self.get(); + pushStack: function(a,args) { + var fn = args[args.length-1]; + + if ( !fn || fn.constructor != Function ) { + if ( !this.stack ) this.stack = []; + this.stack.push( this.get() ); + this.get( a ); + } else { + var old = this.get(); + this.get( a ); + if ( fn.constructor == Function ) + return this.each( fn ); + this.get( old ); } - for ( var k in self ) {(function(j){ - try { - if ( !$a[j] ) { - $a[j] = function() { - return $.apply(self,self[j],arguments); - }; - } - } catch(e) {} - })(k);} - return $a; - } + + return this; + }, + + end: function() { + this.get( this.stack.pop() ); + return this; + }, - return self; -} + find: function(t) { + return this.pushStack( $.map( this, function(a){ + return jQuery.Select(t,a); + }), arguments ); + }, + + parent: function(a) { + var ret = jQuery.map(this,"a.parentNode"); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack( ret, arguments ); + }, + + parents: function(a) { + var ret = jQuery.map(this,jQuery.parents); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack( ret, arguments ); + }, + + siblings: function(a) { + // Incorrect, need to exclude current element + var ret = jQuery.map(this,jQuery.sibling); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack( ret, arguments ); + }, + + filter: function(t) { + if ( /,/.test(t) ) { + var p = t.split(/\s*,\s*/); + return this.pushStack( $.map(this,function(a){ + for ( var i = 0; i < p.length; i++ ) + if ( jQuery.filter(p[i],[a]).r.length ) + return a; + }), arguments ); + } else + return this.pushStack( jQuery.filter(t,this).r, arguments ); + }, + not: function(t) { + return this.pushStack( t.constructor == String ? + jQuery.filter(t,this,false).r : + jQuery.grep(this,function(a){ return a != t; }), arguments ); + }, + add: function(t) { + return this.pushStack( jQuery.merge( this, t.constructor == String ? + jQuery.Select(t) : t.constructor == Array ? t : [t] ), arguments ); + }, + + /** + * A wrapper function for each() to be used by append and prepend. + * Handles cases where you're trying to modify the inner contents of + * a table, when you actually need to work with the tbody. + * + * @member jQuery + * @param {String} expr The expression with which to filter + * @type Boolean + */ + is: function(expr) { + return jQuery.filter(expr,this).r.length > 0; + }, + + /** + * A wrapper function for each() to be used by append and prepend. + * Handles cases where you're trying to modify the inner contents of + * a table, when you actually need to work with the tbody. + * + * @private + * @member jQuery + * @param {Function} fn The function doing the DOM manipulation. + * @type jQuery + */ + domManip: function(fn){ + return this.each(function(){ + var obj = this; + + if ( this.nodeName == "TABLE" ) { + var tbody = this.getElementsByTagName("tbody"); + + if ( !tbody.length ) { + obj = document.createElement("tbody"); + this.appendChild( obj ); + } else + obj = tbody[0]; + } + + fn.apply( obj ); + }); + } +}; + +/** + * Similar to the Prototype $A() function, only it allows you to + * forcefully pass array-like structures into $(). + */ +jQuery.A = function(a){ + // Create a temporary, clean, array + var r = []; + + // and copy the old array contents over to it + for ( var i = 0; i < a.length; i++ ) + r.push( a[i] ); + + // Return the sane jQuery object + return $(r); +}; + +jQuery.className = { + add: function(o,c){ + if (jQuery.hasWord(o,c)) return; + o.className += ( o.className ? " " : "" ) + c; + }, + remove: function(o,c){ + o.className = !c ? "" : + o.className.replace( + new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), ""); + } +}; (function(){ var b = navigator.userAgent.toLowerCase(); // Figure out what browser is being used - $.browser = + jQuery.browser = ( /webkit/.test(b) && "safari" ) || ( /opera/.test(b) && "opera" ) || ( /msie/.test(b) && "msie" ) || @@ -330,342 +430,309 @@ function $(a,c) { "other"; // Check to see if the W3C box model is being used - $.boxModel = ( $.browser != "msie" || - document.compatMode == "CSS1Compat" ); + jQuery.boxModel = ( jQuery.browser != "msie" || document.compatMode == "CSS1Compat" ); })(); -$.apply = function(o,f,a) { - a = a || []; - if ( f.apply ) { - return f.apply( o, a ); - } else { - var p = []; - for (var i = 0; i < a.length; i++) { - p[i] = 'a['+i+']'; - } - o.$$exec = this; - var r = eval('o.$$exec(' + p.join(',') + ')'); - o.$$exec = null; - return r; +$.swap = function(e,o,f) { + for ( var i in o ) { + e.style["old"+i] = e.style[i]; + e.style[i] = o[i]; } + f.apply( e, [] ); + for ( var i in o ) + e.style[i] = e.style["old"+i]; }; -$.getCSS = function(e,p) { +jQuery.css = function(e,p) { // Adapted from Prototype 1.4.0 - if ( p == 'height' || p == 'width' ) { + if ( p == "height" || p == "width" ) { + var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"]; - // Handle extra width/height provided by the W3C box model - var ph = !$.boxModel ? 0 : - parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) + - parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom")); - - var pw = !$.boxModel ? 0 : - parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) + - parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight")); - - var oHeight, oWidth; - - if ($.css(e,"display") != 'none') { - oHeight = e.offsetHeight || parseInt(e.style.height,10); - oWidth = e.offsetWidth || parseInt(e.style.width,10); - } else { - var els = e.style; - var ov = els.visibility; - var op = els.position; - var od = els.display; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = ''; - oHeight = e.clientHeight || parseInt(e.style.height,10); - oWidth = e.clientWidth || parseInt(e.style.width,10); - els.display = od; - els.position = op; - els.visibility = ov; + for ( var i in d ) { + old["padding" + d[i]] = 0; + old["border" + d[i] + "Width"] = 0; } - return p == 'height' ? - (oHeight - ph < 0 ? 0 : oHeight - ph) : - (oWidth - pw < 0 ? 0 : oWidth - pw); + $.swap( e, old, function() { + if (jQuery.css(e,"display") != 'none') { + oHeight = e.offsetHeight; + oWidth = e.offsetWidth; + } else + $.swap( e, { visibility: 'hidden', position: 'absolute', display: '' }, + function(){ + oHeight = e.clientHeight; + oWidth = e.clientWidth; + }); + }); + + return p == "height" ? oHeight : oWidth; } - if (e.style[p]) { - return e.style[p]; - } else if (e.currentStyle) { - return e.currentStyle[p]; - } else if (document.defaultView && document.defaultView.getComputedStyle) { - p = p.replace(/([A-Z])/g,"-$1"); - p = p.toLowerCase(); + var r; + + if (e.style[p]) + r = e.style[p]; + else if (e.currentStyle) + r = e.currentStyle[p]; + else if (document.defaultView && document.defaultView.getComputedStyle) { + p = p.replace(/([A-Z])/g,"-$1").toLowerCase(); var s = document.defaultView.getComputedStyle(e,""); - var r = s ? s.getPropertyValue(p) : p; - return r; - } else { - return null; - } + r = s ? s.getPropertyValue(p) : null; + } + + return r; }; -$.css = $.getCSS; -$.clean = function(a) { +jQuery.clean = function(a) { var r = []; for ( var i = 0; i < a.length; i++ ) { if ( a[i].constructor == String ) { - if ( a[i].indexOf("