X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=8ca3870337c44ec1066fd8167a792a56cce059fd;hb=05a4b784e892ea0dd56201fa1b7a77c7a453bfa7;hp=668a592d5892f1b77bda19b21b9ccf408290a86e;hpb=4ab5a88bc4cd76c293190ed68a4962d91c108816;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 668a592..8ca3870 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -1,599 +1,709 @@ /* - * JQuery (http://jquery.com/) - * By John Resig (http://ejohn.org/) - * Under an Attribution, Share Alike License + * jQuery - New Wave Javascript + * + * Copyright (c) 2006 John Resig (jquery.com) + * Licensed under the MIT License: + * http://www.opensource.org/licenses/mit-license.php * * $Date$ * $Rev$ */ -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 != null ) 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 i == null ? 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 ( b == null ) +/** + * Create a new jQuery Object + * @constructor + */ +function jQuery(a,c) { + // Watch for when a jQuery object is passed in as an arg + if ( a && a.jquery ) + return a; + + // If the context is global, return a new object + if ( window == this ) + return new jQuery(a,c); + + // Find the matching elements and save them for later + this.cur = jQuery.Select( + a || jQuery.context || document, + c && c.jquery && c.get(0) || c + ); +} + +/** + * The jQuery query object. + */ +if ( !window.$ ) + var $ = jQuery; + +/* + * Handle support for overriding other $() functions. Way too many libraries + * provide this function to simply ignore it and overwrite it. + */ +else + var $ = function(a,c) { + // Check to see if this is a possible collision case + if ( !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 ) { + + // Only return the element if it's found + var obj = document.getElementById(a); + if ( obj ) return obj; + + } + + return jQuery(a,c); + }; + +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.get().length; + }, + + /** + * 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) { + return num == undefined ? this.cur : this.cur[num]; + }, + + each: function(f) { + for ( var i = 0; i < this.size(); i++ ) + f.apply( this.get(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.get(0).innerHTML : this.set( "innerHTML", h ); + }, + val: function(h) { + return h == undefined && this.size() ? + this.get(0).value : this.set( "value", h ); + }, + text: function(e) { + e = e || this.get(); + var t = ""; + for ( var j = 0; j < e.length; j++ ) + for ( var i = 0; i < e[j].childNodes.length; i++ ) + t += e[j].childNodes[i].nodeType != 1 ? + e[j].childNodes[i].nodeValue : + jQuery.fn.text(e[j].childNodes[i].childNodes); + return t; + }, + + css: function(a,b) { + return a.constructor != String || b ? + this.each(function(){ + if ( b === undefined ) for ( var j in a ) - $.attr(this,j,a[j]); - else - $.attr(this,a,b); - }); - }, - html: function(h) { - return h == null && this.size() ? - this.get(0).innerHTML : this.set( "innerHTML", h ); - }, - val: function(h) { - return h == null && 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; - this.className += ( this.className.length > 0 ? " " : "" ) + c; - }); - }, - removeClass: function(c) { - return this.each(function(){ - this.className = c == null ? '' : - 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'), ''); + jQuery.attr(this.style,j,a[j]); 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 ); - }); - }, - - empty: function() { - return this.each(function(){ - while ( this.firstChild ) - this.removeChild( this.firstChild ); - }); - }, - - bind: function(t,f) { - return this.each(function(){addEvent(this,t,f);}); - }, - unbind: function(t,f) { - return this.each(function(){removeEvent(this,t,f);}); - }, - trigger: function(t) { - return this.each(function(){triggerEvent(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); - } - }; + jQuery.attr(this.style,a,b); + }) : jQuery.css( this.get(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() { + this.each(function(){this.parentNode.removeChild( this );}); + return this.pushStack( [] ); + }, - // TODO: Remove need to return this - for ( var i in $.fn ) { - if ( self[i] != null ) - self["_"+i] = self[i]; - self[i] = $.fn[i]; - } + 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 ); + }); + }, - if ( typeof Prototype != "undefined" && $a.constructor != String ) { - if ( $c ) $a = self.get(); - for ( var i in self ) {(function(j){ - try { - if ( $a[j] == null ) { - $a[j] = function() { - return $.apply(self,self[j],arguments); - }; - } - } catch(e) {} - })(i);} - return $a; - } + 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] ); + }); + }, - return self; -} + 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);}); + }, + + pushStack: function(a) { + if ( !this.stack ) this.stack = []; + this.stack.unshift( this.cur ); + if ( a ) this.cur = a; + return this; + }, + + find: function(t) { + var ret = []; + this.each(function(){ + ret = jQuery.merge( ret, jQuery.Select(t,this) ); + }); + this.pushStack( ret ); + return this; + }, + + end: function() { + this.cur = this.stack.shift(); + return this; + }, + + parent: function(a) { + var ret = jQuery.map(this.cur,"d.parentNode"); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack(ret); + }, + + parents: function(a) { + var ret = jQuery.map(this.cur,jQuery.parents); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack(ret); + }, + + siblings: function(a) { + // Incorrect, need to exclude current element + var ret = jQuery.map(this.cur,jQuery.sibling); + if ( a ) ret = jQuery.filter(a,ret).r; + return this.pushStack(ret); + }, + + filter: function(t) { + return this.pushStack( jQuery.filter(t,this.cur).r ); + }, + not: function(t) { + return this.pushStack( t.constructor == String ? + jQuery.filter(t,this.cur,false).r : + jQuery.grep(this.cur,function(a){ return a != t; }) ); + }, + add: function(t) { + return this.pushStack( jQuery.merge( this.cur, t.constructor == String ? + jQuery.Select(t) : t.constructor == Array ? t : [t] ) ); + }, + + /** + * 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.cur).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 ); + }); + } +}; -$.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; +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"), ""); } }; -$.getCSS = function(e,p) { +(function(){ + var b = navigator.userAgent.toLowerCase(); + + // Figure out what browser is being used + jQuery.browser = + ( /webkit/.test(b) && "safari" ) || + ( /opera/.test(b) && "opera" ) || + ( /msie/.test(b) && "msie" ) || + ( !/compatible/.test(b) && "mozilla" ) || + "other"; + + // Check to see if the W3C box model is being used + jQuery.boxModel = ( jQuery.browser != "msie" || document.compatMode == "CSS1Compat" ); +})(); + +jQuery.css = function(e,p) { // Adapted from Prototype 1.4.0 - if ( p == 'height' || p == 'width' ) { - if ($.getCSS(e,"display") != 'none') - return p == 'height' ? - e.offsetHeight || parseInt(e.style.height) : - e.offsetWidth || parseInt(e.style.width); - var els = e.style; - var ov = els.visibility; - var op = els.position; - var od = els.display; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = ''; - var oHeight = e.clientHeight || parseInt(e.style.height); - var oWidth = e.clientWidth || parseInt(e.style.width); - els.display = od; - els.position = op; - els.visibility = ov; - return p == 'height' ? oHeight : oWidth; + if ( p == "height" || p == "width" ) { + + // Handle extra width/height provided by the W3C box model + var ph = (!jQuery.boxModel ? 0 : + jQuery.css(e,"paddingTop") + jQuery.css(e,"paddingBottom") + + jQuery.css(e,"borderTopWidth") + jQuery.css(e,"borderBottomWidth")) || 0; + + var pw = (!jQuery.boxModel ? 0 : + jQuery.css(e,"paddingLeft") + jQuery.css(e,"paddingRight") + + jQuery.css(e,"borderLeftWidth") + jQuery.css(e,"borderRightWidth")) || 0; + + var oHeight, oWidth; + + if (jQuery.css(e,"display") != 'none') { + oHeight = e.offsetHeight || parseInt(e.style.height) || 0; + oWidth = e.offsetWidth || parseInt(e.style.width) || 0; + } 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); + oWidth = e.clientWidth || parseInt(e.style.width); + els.display = od; + els.position = op; + els.visibility = ov; + } + + return p == "height" ? + (oHeight - ph < 0 ? 0 : oHeight - ph) : + (oWidth - pw < 0 ? 0 : oWidth - pw); } + var r; + if (e.style[p]) - return e.style[p]; - else if (e.currentStyle) - return e.currentStyle[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"); - p = p.toLowerCase(); + 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 /top|right|left|bottom/i.test(p) ? parseFloat( r ) : r; }; -$.css = $.getCSS; -$.clean = function(a) { +jQuery.clean = function(a) { var r = []; - for ( var i = 0; i < a.length; i++ ) + for ( var i = 0; i < a.length; i++ ) { if ( a[i].constructor == String ) { + + if ( !a[i].indexOf("