X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=jquery%2Fjquery.js;h=325793d37df3131aab2e44438bf33afbb3a1b720;hb=07040f8d039c116b8e5d0c493ba09f3b89c9479b;hp=1133ad43a0e7f64be04864737058cc9fd0867cf8;hpb=497bfb7909ada30e3410827808bc0c1a0d9843a7;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 1133ad4..325793d 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -1,7 +1,7 @@ /* - * jQuery (jquery.com) + * jQuery * - * 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,623 +9,587 @@ * $Rev$ */ -/* For JSLint (jslint.com): */ -/*extern ActiveXObject Prototype setTimeout setInterval clearInterval document window XMLHttpRequest navigator*/ +// Global undefined variable +window.undefined = window.undefined; -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; - }); - } - } +function jQuery(a,c) { + this.cur = $.Select( + a || $.context || document, + c && c.$jquery && c.get(0) || c + ); +} - // 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 ( b === null ) { - 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 null; - } - 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'), ''); - } 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 ); - } - }); - }, +if ( window.$ == undefined ) + var $ = function(a,c) { + 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 = []; +jQuery.prototype = $.fn = { + $jquery: "$Rev$", + + // The only two getters + size: function() { + return this.get().length; + }, + get: function(i) { + return i == undefined ? this.cur : this.cur[i]; + }, + + 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 ) + $.attr(this,j,a[j]); + else + $.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 : + $.fn.text(e[j].childNodes[i].childNodes); + return t; + }, + + css: function(a,b) { + return a.constructor != String || b ? 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); - } - }; + 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 = $.css(this,"display"); + if ( d == "none" || d === "" ) + $(this).show(); + else + $(this).hide(); + }); + }, + show: function() { + return this.each(function(){ + this.style.display = this.oldblock ? this.oldblock : ""; + if ( $.css(this,"display") == "none" ) + this.style.display = "block"; + }); + }, + hide: function() { + return this.each(function(){ + this.oldblock = $.css(this,"display"); + if ( this.oldblock == "none" ) + this.oldblock = "block"; + this.style.display = "none"; + }); + }, + addClass: function(c) { + return this.each(function(){ + $.class.add(this,c); + }); + }, + removeClass: function(c) { + return this.each(function(){ + $.class.remove(this,c); + }); + }, + // TODO: Optomize + toggleClass: function(c) { + return this.each(function(){ + if ($.hasWord(this,c)) + $.class.remove(this,c); + else + $.class.add(this,c); + }); + }, + remove: function() { + this.each(function(){this.parentNode.removeChild( this );}); + this.cur = []; + return this; + }, - // 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 = $.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 k in self ) {(function(j){ - try { - if ( $a[j] === null ) { - $a[j] = function() { - return $.apply(self,self[j],arguments); - }; - } - } catch(e) {} - })(k);} - return $a; - } + append: function() { + var clone = this.size() > 1; + var a = $.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; -} - -$.eval = eval; + 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.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 = $.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(){$.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,"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; + }, + + /** + * 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. + */ + 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; +$.class = { + add: function(o,c){ + if ($.hasWord(o,c)) return; + o.className += ( o.className.length > 0 ? " " : "" ) + 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 + $.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 + $.boxModel = ( $.browser != "msie" || document.compatMode == "CSS1Compat" ); +})(); + +$.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,10) : - e.offsetWidth || parseInt(e.style.width,10); + if ( p == "height" || p == "width" ) { + + // Handle extra width/height provided by the W3C box model + var ph = (!$.boxModel ? 0 : + $.css(e,"paddingTop") + $.css(e,"paddingBottom") + + $.css(e,"borderTopWidth") + $.css(e,"borderBottomWidth")) || 0; + + var pw = (!$.boxModel ? 0 : + $.css(e,"paddingLeft") + $.css(e,"paddingRight") + + $.css(e,"borderLeftWidth") + $.css(e,"borderRightWidth")) || 0; + + var oHeight, oWidth; + + if ($.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; } - 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,10); - var oWidth = e.clientWidth || parseInt(e.style.width,10); - els.display = od; - els.position = op; - els.visibility = ov; - return p == 'height' ? oHeight : oWidth; + + return p == "height" ? + (oHeight - ph < 0 ? 0 : oHeight - ph) : + (oWidth - pw < 0 ? 0 : oWidth - pw); } - 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 /top|right|left|bottom/i.test(p) ? parseFloat( r ) : r; }; -$.css = $.getCSS; $.clean = function(a) { var r = []; for ( var i = 0; i < a.length; i++ ) { if ( a[i].constructor == String ) { + + if ( !a[i].indexOf("