From d71a85001b0562ed05925e0c5635c3c0a1d52068 Mon Sep 17 00:00:00 2001 From: John Resig Date: Tue, 16 May 2006 22:15:05 +0000 Subject: [PATCH] jQuery is now JSLint (jslint.com) compatible, save for the eval stuff. Can't there b e legitamite uses for eval? --- ajax/ajax.js | 52 +++---- event/event.js | 39 +++--- fx/fx.js | 70 +++++----- jquery/jquery.js | 349 ++++++++++++++++++++++++++++------------------- 4 files changed, 298 insertions(+), 212 deletions(-) diff --git a/ajax/ajax.js b/ajax/ajax.js index ecac5811..a972871b 100644 --- a/ajax/ajax.js +++ b/ajax/ajax.js @@ -3,7 +3,7 @@ // http://jquery.com/docs/ajax/ if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'function') { - var XMLHttpRequest = function() { + XMLHttpRequest = function() { return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ? "Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"); }; @@ -23,15 +23,17 @@ $.xml = function( type, url, data, ret ) { // // Show loader if needed - if ($.xmlCreate) + if ($.xmlCreate) { $.xmlCreate(); + } // // Open the socket xml.open(type || "GET", url, true); - if ( data ) + if ( data ) { xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + } // // Set header so calling script knows that it's an XMLHttpRequest @@ -41,12 +43,13 @@ $.xml = function( type, url, data, ret ) { * a bug where XMLHttpReqeuest sends an incorrect Content-length * header. See Mozilla Bugzilla #246651. */ - if ( xml.overrideMimeType ) + if ( xml.overrideMimeType ) { xml.setRequestHeader('Connection', 'close'); + } xml.onreadystatechange = function() { if ( xml.readyState == 4 ) { - if ( ret ) ret(xml); + if ( ret ) { ret(xml); } // // Decrease counter @@ -55,13 +58,14 @@ $.xml = function( type, url, data, ret ) { // // Hide loader if needed if ($.xmlActive <= 0) { - if ($.xmlDestroy) + if ($.xmlDestroy) { $.xmlDestroy(); + } } } }; - xml.send(data) + xml.send(data); } }; @@ -72,7 +76,7 @@ $.httpData = function(r,type) { $.get = function( url, ret, type ) { $.xml( "GET", url, null, function(r) { - if ( ret ) ret( $.httpData(r,type) ); + if ( ret ) { ret( $.httpData(r,type) ); } }); }; @@ -82,7 +86,7 @@ $.getXML = function( url, ret ) { $.post = function( url, data, ret, type ) { $.xml( "POST", url, $.param(data), function(r) { - if ( ret ) ret( $.httpData(r,type) ); + if ( ret ) { ret( $.httpData(r,type) ); } }); }; @@ -93,11 +97,13 @@ $.postXML = function( url, data, ret ) { $.param = function(a) { var s = []; if (a && typeof a == 'object' && a.constructor == Array) { - for ( var i=0; i < a.length; i++ ) - s[s.length] = a[i]['name'] + "=" + encodeURIComponent( a[i]['value'] ); + for ( var i=0; i < a.length; i++ ) { + s[s.length] = a[i].name + "=" + encodeURIComponent( a[i].value ); + } } else { - for ( var i in a ) - s[s.length] = i + "=" + encodeURIComponent( a[i] ); + for ( var j in a ) { + s[s.length] = j + "=" + encodeURIComponent( a[j] ); + } } return s.join("&"); }; @@ -106,27 +112,28 @@ $.fn.load = function(a,o,f) { // Arrrrghhhhhhhh!! // I overwrote the event plugin's .load // this won't happen again, I hope -John - if ( a && a.constructor == Function ) + if ( a && a.constructor == Function ) { return this.bind("load", a); + } var t = "GET"; if ( o && o.constructor == Function ) { f = o; o = null; } - if (o != null) { + if (o !== null) { o = $.param(o); t = "POST"; } var self = this; $.xml(t,a,o,function(h){ - var h = h.responseText; + h = h.responseText; self.html(h).find("script").each(function(){ try { eval( this.text || this.textContent || this.innerHTML ); } catch(e){} }); - if(f)f(h); + if(f){f(h);} }); return this; }; @@ -137,12 +144,11 @@ $.fn.load = function(a,o,f) { * docs: Gets the form values and creates a key=>value array of the found values (only for ENABLED elements!) */ $.fn.formValues = function() { - var a = new Array(); - this.find("input[@type='submit'],input[@type='hidden'],textarea,input[@checked],input[@type='password'],input[@type='text'],option[@selected]") - .filter(":enabled").each(function() { + var a = []; + this.find("input[@type='submit'],input[@type='hidden'],textarea,input[@checked],input[@type='password'],input[@type='text'],option[@selected]").filter(":enabled").each(function() { o = {}; - o['name'] = this.name || this.id || this.parentNode.name || this.parentNode.id; - o['value'] = this.value; + o.name = this.name || this.id || this.parentNode.name || this.parentNode.id; + o.value = this.value; a.push(o); }); return a; @@ -169,6 +175,6 @@ $.update = function(objElement, strURL, arrValues, fncCallback) { // // Callback handler - if (fncCallback) fncCallback(); + if (fncCallback) { fncCallback(); } }); }; diff --git a/event/event.js b/event/event.js index 05247bcf..dff2e2eb 100644 --- a/event/event.js +++ b/event/event.js @@ -10,7 +10,7 @@ for ( var i = 0; i < e.length; i++ ) { $.fn["un"+o] = function(f){ return this.unbind(o, f); }; $.fn["do"+o] = function(){ return this.trigger(o); }; $.fn["one"+o] = function(f){ return this.bind(o, function(e){ - if ( this[o+f] != null ) return true; + if ( this[o+f] !== null ) { return true; } this[o+f]++; return $.apply(this,f,[e]); }); }; @@ -25,15 +25,15 @@ $.fn.hover = function(f,g) { return this.each(function(){ var obj = this; addEvent(this, "mouseover", function(e) { - var p = ( e.fromElement != null ? e.fromElement : e.relatedTarget ); - while ( p && p != obj ) p = p.parentNode; - if ( p == obj ) return false; + var p = ( e.fromElement !== null ? e.fromElement : e.relatedTarget ); + while ( p && p != obj ) { p = p.parentNode; } + if ( p == obj ) { return false; } return $.apply(obj,f,[e]); }); addEvent(this, "mouseout", function(e) { - var p = ( e.toElement != null ? e.toElement : e.relatedTarget ); - while ( p && p != obj ) p = p.parentNode; - if ( p == obj ) return false; + var p = ( e.toElement !== null ? e.toElement : e.relatedTarget ); + while ( p && p != obj ) { p = p.parentNode; } + if ( p == obj ) { return false; } return $.apply(obj,g,[e]); }); }); @@ -43,17 +43,19 @@ $.fn.hover = function(f,g) { $.fn.onhover = $.fn.hover; $.ready = function() { - if ( $.$$timer ) { - clearInterval( $.$$timer ); - $.$$timer = null; - for ( var i = 0; i < $.$$ready.length; i++ ) - $.apply( document, $.$$ready[i] ); - $.$$ready = null; - } + if ( $.$$timer ) { + clearInterval( $.$$timer ); + $.$$timer = null; + for ( var i = 0; i < $.$$ready.length; i++ ) { + $.apply( document, $.$$ready[i] ); + } + $.$$ready = null; + } }; -if ( document.addEventListener ) +if ( document.addEventListener ) { document.addEventListener( "DOMContentLoaded", $.ready, null ); +} addEvent( window, "load", $.ready ); @@ -62,11 +64,12 @@ $.fn.ready = function(f) { if ( $.$$timer ) { $.$$ready.push( f ); } else { - var o = this; + var o = this; $.$$ready = [ f ]; $.$$timer = setInterval( function(){ - if ( o && o.getElementsByTagName && o.getElementById && o.body ) + if ( o && o.getElementsByTagName && o.getElementById && o.body ) { $.ready(); + } }, 10 ); } }); @@ -81,4 +84,4 @@ $.fn.toggle = function(a,b) { e.preventDefault(); return $.apply( this, this.$$last, [e] ) || false; }) : this._toggle(); -}; \ No newline at end of file +}; diff --git a/fx/fx.js b/fx/fx.js index f74c19a9..ca7ebbb0 100644 --- a/fx/fx.js +++ b/fx/fx.js @@ -1,5 +1,5 @@ $.speed = function(s,o) { - if ( o && o.constructor == Function ) o = { onComplete: o }; + if ( o && o.constructor == Function ) { o = { onComplete: o }; } o = o || {}; var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400}; o.duration = typeof s == "number" ? s : ss[s] || 400; @@ -59,11 +59,12 @@ $.fn.center = function(f) { } else { var s = this.style; var p = this.parentNode; - if ( $.css(p,"position") == 'static' ) + if ( $.css(p,"position") == 'static' ) { p.style.position = 'relative'; + } s.position = 'absolute'; - s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2) + "px"; - s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2) + "px"; + s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2, 10) + "px"; + s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2, 10) + "px"; } }); }; @@ -73,8 +74,9 @@ $.setAuto = function(e,p) { var o = $.css(e,p); e.style[p] = 'auto'; var n = $.css(e,p); - if ( o != n ) + if ( o != n ) { e.style[p] = a; + } }; /* @@ -85,15 +87,15 @@ $.setAuto = function(e,p) { function fx(el,op,ty,tz){ var z = this; - z.a = function(){z.el.style[ty]=z.now+z.o.unit}; - z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur()}; - z.cur = function(){return parseInt($.getCSS(z.el,ty))}; - z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max())}; - z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0)}; - z.ss = function(a){if(y.display!=a)y.display=a}; - z.toggle = function(){if(z.cur()>0)z.hide();else z.show()}; - z.modify = function(a){z.custom(z.cur(),z.cur()+a)}; - z.clear = function(){clearInterval(z.timer);z.timer=null}; + z.a = function(){z.el.style[ty]=z.now+z.o.unit;}; + z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur();}; + z.cur = function(){return parseInt($.getCSS(z.el,ty),10);}; + z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max());}; + z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0);}; + z.ss = function(a){if(y.display!=a){y.display=a;}}; + z.toggle = function(){if(z.cur()>0){z.hide();}else{z.show();}}; + z.modify = function(a){z.custom(z.cur(),z.cur()+a);}; + z.clear = function(){clearInterval(z.timer);z.timer=null;}; z.el = el.constructor==String?document.getElementById(el):el; var y = z.el.style; z.oo = y.overflow; @@ -104,44 +106,48 @@ function fx(el,op,ty,tz){ onComplete: (op && op.onComplete) || op }; z.step = function(f,tt){ - var t = (new Date).getTime(); + var t = (new Date()).getTime(); var p = (t - z.s) / z.o.duration; if (t >= z.o.duration+z.s) { z.now = tt; z.clear(); setTimeout(function(){ y.overflow = z.oo; - if(y.height=="0px"||y.width=="0px")z.ss("none"); + if(y.height=="0px"||y.width=="0px"){z.ss("none");} if ( ty != "opacity" && z.o.auto ) { $.setAuto( z.el, "height" ); $.setAuto( z.el, "width" ); } if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();} },13); - } else + } else { z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (tt-f) + f; + } z.a(); }; z.custom = function(f,t){ - if(z.timer)return;this.now=f;z.a();z.io=z.cur();z.s=(new Date).getTime(); + if(z.timer) {return null;} + this.now=f;z.a();z.io=z.cur();z.s=(new Date()).getTime(); z.timer=setInterval(function(){z.step(f,t);}, 13); }; } fx.fn = ["show","hide","toggle"]; fx.ty = ["Height","Width","Left","Top"]; -for(var i in fx.ty){(function(){ - var c = fx.ty[i]; +for(var $i in fx.ty){(function(){ + var c = fx.ty[$i]; fx[c] = function(a,b){ - return new fx(a,b,c.toLowerCase(),c);}; -})()} + return new fx(a,b,c.toLowerCase(),c); + }; +})();} fx.Opacity = function(a,b){ var o = new fx(a,b,"opacity"); o.cur = function(){return parseFloat(o.el.style.opacity);}; o.a = function() { var e = o.el.style; - if (o.now == 1) o.now = 0.9999; - if (window.ActiveXObject) + if (o.now == 1) { o.now = 0.9999; } + if (window.ActiveXObject) { e.filter = "alpha(opacity=" + o.now*100 + ")"; + } e.opacity = o.now; }; o.io = o.now = 1; @@ -151,16 +157,16 @@ fx.Opacity = function(a,b){ fx.Resize = function(e,o){ var z = this; var h = new fx.Height(e,o); - if(o) o.onComplete = null; + if(o) { o.onComplete = null; } var w = new fx.Width(e,o); - function c(a,b,c){return (!a||a==c||b==c);} + function c(a,b,d){return (!a||a==c||b==d);} for(var i in fx.fn){(function(){ var j = fx.fn[i]; z[j] = function(a,b){ - if(c(a,b,"height")) h[j](); - if(c(a,b,"width")) w[j](); + if(c(a,b,"height")) { h[j](); } + if(c(a,b,"width")) { w[j](); } }; - })()} + })();} z.modify = function(c,d){ h.modify(c); w.modify(d); @@ -169,10 +175,10 @@ fx.Resize = function(e,o){ fx.FadeSize = function(e,o){ var z = this; var r = new fx.Resize(e,o); - if(o) o.onComplete = null; + if(o) { o.onComplete = null; } var p = new fx.Opacity(e,o); for(var i in fx.fn){(function(){ var j = fx.fn[i]; z[j] = function(a,b){p[j]();r[j](a,b);}; - })()} -}; \ No newline at end of file + })();} +}; diff --git a/jquery/jquery.js b/jquery/jquery.js index b9f575be..bd25ed20 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -20,15 +20,16 @@ function $(a,c) { var re = new RegExp( "[^a-zA-Z0-9_-]" ); if ( !re.test($a) ) { $c = $c && $c.documentElement || document; - if ( $c.getElementsByTagName($a).length == 0 ) { + if ( $c.getElementsByTagName($a).length === 0 ) { var obj = $c.getElementById($a); - if ( obj != null ) return obj; + if ( obj !== null ) { return obj; } } } } else if ( $a.constructor == Array ) { return $.map( $a, function(b){ - if ( b.constructor == String ) + if ( b.constructor == String ) { return document.getElementById(b); + } return b; }); } @@ -40,75 +41,87 @@ function $(a,c) { $jquery: "$Rev$", // The only two getters - size: function() {return this.get().length}, + size: function() {return this.get().length;}, get: function(i) { - return i == null ? this.cur : this.cur[i]; + return i === null ? this.cur : this.cur[i]; }, each: function(f) { - for ( var i = 0; i < this.size(); i++ ) + 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 ) + if ( b === null ) { + for ( var j in a ) { $.attr(this,j,a[j]); - else + } + } else { $.attr(this,a,b); + } }); }, html: function(h) { - return h == null && this.size() ? + return h === null && this.size() ? this.get(0).innerHTML : this.set( "innerHTML", h ); }, val: function(h) { - return h == null && this.size() ? + 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 ) + if ( !b ) { + for ( var j in a ) { $.attr(this.style,j,a[j]); - else + } + } 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 == '' ) + if ( d == "none" || d === '' ) { $(this).show(); - else + } 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'; + 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'; + if ( this.$$oldblock == "none" ) { + this.$$oldblock = 'block'; + } this.style.display = 'none'; }); }, addClass: function(c) { return this.each(function(){ - if ($.hasWord(this,c)) return; + 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 = c === null ? '' : this.className.replace( new RegExp('(^|\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), ''); }); @@ -116,12 +129,13 @@ function $(a,c) { // TODO: Optomize toggleClass: function(c) { return this.each(function(){ - if ($.hasWord(this,c)) + if ($.hasWord(this,c)) { this.className = this.className.replace( new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), ''); - else + } else { this.className += ( this.className.length > 0 ? " " : "" ) + c; + } }); }, remove: function() { @@ -135,7 +149,9 @@ function $(a,c) { return this.each(function(){ var b = a[0].cloneNode(true); this.parentNode.insertBefore( b, this ); - while ( b.firstChild ) b = b.firstChild; + while ( b.firstChild ) { + b = b.firstChild; + } b.appendChild( this ); }); }, @@ -144,16 +160,18 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i = 0; i < a.length; i++ ) + 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++ ) + for ( var i = 0; i < a.length; i++ ) { $(a[i]).append( this ); + } }); }, @@ -161,8 +179,9 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i = a.length - 1; i >= 0; i-- ) + for ( var i = a.length - 1; i >= 0; i-- ) { this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild ); + } }); }, @@ -170,8 +189,9 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i = 0; i < a.length; i++ ) + for ( var i = 0; i < a.length; i++ ) { this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this ); + } }); }, @@ -179,15 +199,17 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i = a.length - 1; i >= 0; i-- ) + 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 ) + while ( this.firstChild ) { this.removeChild( this.firstChild ); + } }); }, @@ -220,20 +242,26 @@ function $(a,c) { this.cur = $.map(this.cur,function(d){ return d.parentNode; }); - if ( a ) this.cur = $.filter(a,this.cur).r; + 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; + 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; + if ( a ) { + this.cur = $.filter(a,this.cur).r; + } return this; }, @@ -262,22 +290,25 @@ function $(a,c) { // TODO: Remove need to return this for ( var i in $.fn ) { - if ( self[i] != null ) + if ( self[i] !== null ) { self["_"+i] = self[i]; + } self[i] = $.fn[i]; } if ( typeof Prototype != "undefined" && $a.constructor != String ) { - if ( $c ) $a = self.get(); - for ( var i in self ) {(function(j){ + if ( $c ) { + $a = self.get(); + } + for ( var k in self ) {(function(j){ try { - if ( $a[j] == null ) { + if ( $a[j] === null ) { $a[j] = function() { return $.apply(self,self[j],arguments); }; } } catch(e) {} - })(i);} + })(k);} return $a; } @@ -286,12 +317,13 @@ function $(a,c) { $.apply = function(o,f,a) { a = a || []; - if ( f.apply ) + if ( f.apply ) { return f.apply( o, a ); - else { + } else { var p = []; - for (var i = 0; i < a.length; i++) + 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; @@ -302,10 +334,11 @@ $.apply = function(o,f,a) { $.getCSS = function(e,p) { // Adapted from Prototype 1.4.0 if ( p == 'height' || p == 'width' ) { - if ($.getCSS(e,"display") != 'none') + if ($.getCSS(e,"display") != 'none') { return p == 'height' ? - e.offsetHeight || parseInt(e.style.height) : - e.offsetWidth || parseInt(e.style.width); + e.offsetHeight || parseInt(e.style.height,10) : + e.offsetWidth || parseInt(e.style.width,10); + } var els = e.style; var ov = els.visibility; var op = els.position; @@ -313,43 +346,48 @@ $.getCSS = function(e,p) { els.visibility = 'hidden'; els.position = 'absolute'; els.display = ''; - var oHeight = e.clientHeight || parseInt(e.style.height); - var oWidth = e.clientWidth || parseInt(e.style.width); + 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; } - if (e.style[p]) + if (e.style[p]) { return e.style[p]; - else if (e.currentStyle) + } else if (e.currentStyle) { return e.currentStyle[p]; - else if (document.defaultView && document.defaultView.getComputedStyle) { + } else if (document.defaultView && document.defaultView.getComputedStyle) { p = p.replace(/([A-Z])/g,"-$1"); p = p.toLowerCase(); var s = document.defaultView.getComputedStyle(e,""); var r = s ? s.getPropertyValue(p) : p; return r; - } else + } else { return null; + } }; $.css = $.getCSS; $.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 ) { var div = document.createElement("div"); div.innerHTML = a[i]; - for ( var j = 0; j < div.childNodes.length; j++ ) + for ( var j = 0; j < div.childNodes.length; j++ ) { r[r.length] = div.childNodes[j]; - } else if ( a[i].length ) - for ( var j = 0; j < a[i].length; j++ ) - r[r.length] = a[i][j]; - else if ( a[i] != null ) + } + } else if ( a[i].length ) { + for ( var k = 0; k < a[i].length; k++ ) { + r[r.length] = a[i][k]; + } + } else if ( a[i] !== null ) { r[r.length] = a[i].nodeType ? a[i] : document.createTextNode(a[i].toString()); + } + } return r; }; @@ -404,17 +442,20 @@ $.fn = {}; $.Select = function( t, context ) { context = context || $.context || document; - if ( t.constructor != String ) return [t]; + if ( t.constructor != String ) { + return [t]; + } - if ( t.indexOf("//") == 0 ) { + if ( t.indexOf("//") === 0 ) { context = context.documentElement; t = t.substr(2,t.length); - } else if ( t.indexOf("/") == 0 ) { + } else if ( t.indexOf("/") === 0 ) { context = context.documentElement; t = t.substr(1,t.length); // FIX Assume the root element is right :( - if ( t.indexOf('/') ) + if ( t.indexOf('/') ) { t = t.substr(t.indexOf('/'),t.length); + } } var ret = [context]; @@ -422,54 +463,57 @@ $.Select = function( t, context ) { var last = null; while ( t.length > 0 && last != t ) { - var r = []; - last = t; + var r = []; + last = t; - t = $.cleanSpaces(t); + t = $.cleanSpaces(t); - var re = new RegExp( "^//", "i" ); - t = t.replace( re, "" ); + var re = new RegExp( "^//", "i" ); + t = t.replace( re, "" ); - if ( t.indexOf('..') == 0 || t.indexOf('/..') == 0 ) { - if ( t.indexOf('/') == 0 ) + if ( t.indexOf('..') === 0 || t.indexOf('/..') === 0 ) { + if ( t.indexOf('/') === 0 ) { t = t.substr(1,t.length); + } r = $.map( ret, function(a){ return a.parentNode; } ); t = t.substr(2,t.length); t = $.cleanSpaces(t); - } else if ( t.indexOf('>') == 0 || t.indexOf('/') == 0 ) { + } else if ( t.indexOf('>') === 0 || t.indexOf('/') === 0 ) { r = $.map( ret, function(a){ return ( a.childNodes.length > 0 ? $.sibling( a.firstChild ) : null ); } ); t = t.substr(1,t.length); t = $.cleanSpaces(t); - } else if ( t.indexOf('+') == 0 ) { + } else if ( t.indexOf('+') === 0 ) { r = $.map( ret, function(a){ return $.sibling(a).next; } ); t = t.substr(1,t.length); t = $.cleanSpaces(t); - } else if ( t.indexOf('~') == 0 ) { + } else if ( t.indexOf('~') === 0 ) { r = $.map( ret, function(a){ var r = []; var s = $.sibling(a); - if ( s.n > 0 ) - for ( var i = s.n; i < s.length; i++ ) + if ( s.n > 0 ) { + for ( var i = s.n; i < s.length; i++ ) { r[r.length] = s[i]; - return r; + } + } + return r; }); t = t.substr(1,t.length); t = $.cleanSpaces(t); - } else if ( t.indexOf(',') == 0 || t.indexOf('|') == 0 ) { - if ( ret[0] == context ) ret.shift(); + } else if ( t.indexOf(',') === 0 || t.indexOf('|') === 0 ) { + if ( ret[0] == context ) { ret.shift(); } done = $.merge( done, ret ); r = ret = [context]; t = " " + t.substr(1,t.length); - } else { - var re = new RegExp( "^([#.]?)([a-z0-9\\*_-]*)", "i" ); - var m = re.exec(t); - + } else { + var re2 = new RegExp( "^([#.]?)([a-z0-9\\*_-]*)", "i" ); + var m = re2.exec(t); + if ( m[1] == "#" ) { // Ummm, should make this work in all XML docs var oid = document.getElementById(m[2]); r = oid ? [oid] : []; t = t.replace( re, "" ); } else { - if ( m[2] == "" || m[1] == "." ) m[2] = "*"; + if ( m[2] === "" || m[1] == "." ) { m[2] = "*"; } for ( var i = 0; i < ret.length; i++ ) { var o = ret[i]; @@ -482,7 +526,7 @@ $.Select = function( t, context ) { case 'button': case 'submit': case 'image': case 'password': case 'reset': case 'file': r = $.merge( $.grep( $.tag(o,"input"), - function(a){ return a.type == m[2] }), r ); + function(a){ return a.type == m[2]; }), r ); break; case 'input': r = $.merge( $.tag(o,"input"), r ); @@ -503,7 +547,7 @@ $.Select = function( t, context ) { t = $.cleanSpaces(val.t); } - if ( ret && ret[0] == context ) ret.shift(); + if ( ret && ret[0] == context ) { ret.shift(); } done = $.merge( done, ret ); return done; }; @@ -524,61 +568,71 @@ $.attr = function(o,a,v){ a = (fix[a] && fix[a].replace && fix[a]) || a; var r = new RegExp("-([a-z])","ig"); a = a.replace(r,function(z,b){return b.toUpperCase();}); - if ( v != null ) { + if ( v !== null ) { o[a] = v; - if ( o.setAttribute ) o.setAttribute(a,v); + if ( o.setAttribute ) { + o.setAttribute(a,v); + } } return o[a] || o.getAttribute(a) || ''; - } else return ''; + } else { + return ''; + } }; $.filter = function(t,r,not) { var g = $.grep; - if ( not == false ) var g = function(a,f) {return $.grep(a,f,true);}; + if ( not === false ) { + g = function(a,f) {return $.grep(a,f,true);}; + } while ( t.length > 0 && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) { var re = new RegExp( "^\\[ *@([a-z0-9\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" ); var m = re.exec(t); - if ( m != null ) { + if ( m !== null ) { m = ['', '@', m[2], m[1], m[3]]; } else { - var re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" ); - var m = re.exec(t); + re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" ); + m = re.exec(t); - if ( m == null ) { - var re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" ); - var m = re.exec(t); + if ( m === null ) { + re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" ); + m = re.exec(t); - if ( m == null ) { - var re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" ); - var m = re.exec(t); + if ( m === null ) { + re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" ); + m = re.exec(t); } } } t = t.replace( re, "" ); - if ( m[1] == ":" && m[2] == "not" ) + if ( m[1] == ":" && m[2] == "not" ) { r = $.filter(m[3],r,false).r; - else { - if ( $.g[m[1]].constructor == String ) - var f = $.g[m[1]]; - else if ( $.g[m[1]][m[2]] ) - var f = $.g[m[1]][m[2]]; + } else { + var f = null; + + if ( $.g[m[1]].constructor == String ) { + f = $.g[m[1]]; + } else if ( $.g[m[1]][m[2]] ) { + f = $.g[m[1]][m[2]]; + } - if ( f != null ) { - eval("f = function(a,i){return " + f + "}"); + if ( f !== null ) { + f = new Function('a','i','return ' + f); r = g( r, f ); } } } + return { r: r, t: t }; }; $.parents = function(a){ var b = []; var c = a.parentNode; - while ( c != null && c != document ) { + while ( c !== null && c != document ) { b[b.length] = c; c = c.parentNode; } @@ -586,25 +640,27 @@ $.parents = function(a){ }; $.cleanSpaces = function(t){ - return t.replace(/^\s+|\s+$/g, '') + return t.replace(/^\s+|\s+$/g, ''); }; $.ofType = function(a,n,e) { - var t = $.grep($.sibling(a),function(b){return b.nodeName == a.nodeName}); - if ( e ) n = t.length - n - 1; - return n != null ? t[n] == a : t.length; + var t = $.grep($.sibling(a),function(b){return b.nodeName == a.nodeName;}); + if ( e ) { n = t.length - n - 1; } + return n !== null ? t[n] == a : t.length; }; $.sibling = function(a,n,e) { var type = []; var tmp = a.parentNode.childNodes; for ( var i = 0; i < tmp.length; i++ ) { - if ( tmp[i].nodeType == 1 ) + if ( tmp[i].nodeType == 1 ) { type[type.length] = tmp[i]; - if ( tmp[i] == a ) + } + if ( tmp[i] == a ) { type.n = type.length - 1; + } } - if ( e ) n = type.length - n - 1; + if ( e ) { n = type.length - n - 1; } type.cur = ( type[n] == a ); type.prev = ( type.n > 0 ? type[type.n - 1] : null ); type.next = ( type.n < type.length - 1 ? type[type.n + 1] : null ); @@ -612,9 +668,9 @@ $.sibling = function(a,n,e) { }; $.hasWord = function(e,a) { - if ( e == null ) return false; - if ( e.className != null ) e = e.className; - return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e) + if ( e === null ) { return false; } + if ( e.className !== null ) { e = e.className; } + return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e); }; $.getAll = function(o,r) { @@ -631,26 +687,32 @@ $.getAll = function(o,r) { $.merge = function(a,b) { var d = []; - for ( var j = 0; j < b.length; j++ ) - d[j] = b[j]; + for ( var k = 0; k < b.length; k++ ) { d[k] = b[k]; } for ( var i = 0; i < a.length; i++ ) { var c = true; - for ( var j = 0; j < b.length; j++ ) - if ( a[i] == b[j] ) + for ( var j = 0; j < b.length; j++ ) { + if ( a[i] == b[j] ) { c = false; - if ( c ) - d[d.length] = a[i]; + } + } + if ( c ) { + d[d.length] = a[i]; + } } + return d; }; $.grep = function(a,f,s) { var r = []; - if ( a != null ) - for ( var i = 0; i < a.length; i++ ) - if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) ) + if ( a !== null ) { + for ( var i = 0; i < a.length; i++ ) { + if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) ) { r[r.length] = a[i]; + } + } + } return r; }; @@ -658,8 +720,8 @@ $.map = function(a,f) { var r = []; for ( var i = 0; i < a.length; i++ ) { var t = f(a[i],i); - if ( t != null ) { - if ( t.constructor != Array ) t = [t]; + if ( t !== null ) { + if ( t.constructor != Array ) { t = [t]; } r = $.merge( t, r ); } } @@ -669,18 +731,20 @@ $.map = function(a,f) { // Bind an event to an element // Original by Dean Edwards function addEvent(element, type, handler) { - if ( element.location ) element = window; // Ughhhhh.... - if (!handler.$$guid) handler.$$guid = addEvent.guid++; - if (!element.events) element.events = {}; + if ( element.location ) { element = window; } // Ughhhhh.... + if (!handler.$$guid) { handler.$$guid = addEvent.guid++; } + if (!element.events) { element.events = {}; } var handlers = element.events[type]; if (!handlers) { handlers = element.events[type] = {}; - if (element["on" + type]) + if (element["on" + type]) { handlers[0] = element["on" + type]; + } } handlers[handler.$$guid] = handler; element["on" + type] = handleEvent; -}; +} + addEvent.guid = 1; // Detach an event or set of events from an element @@ -690,28 +754,32 @@ function removeEvent(element, type, handler) { if ( handler ) { delete element.events[type][handler.$$guid]; } else { - for ( var i in element.events[type] ) + for ( var i in element.events[type] ) { delete element.events[type][i]; + } } } else { - for ( var i in element.events ) - removeEvent( element, i ); + for ( var j in element.events ) { + removeEvent( element, j ); + } } } -}; +} function triggerEvent(element,type,data) { data = data || [{ type: type }]; - if ( element && element["on" + type] ) + if ( element && element["on" + type] ) { $.apply( element, element["on" + type], data ); + } } function handleEvent(event) { var returnValue = true; event = event || fixEvent(window.event); var handlers = []; - for ( var i in this.events[event.type] ) - handlers[handlers.length] = this.events[event.type][i]; + for ( var j in this.events[event.type] ) { + handlers[handlers.length] = this.events[event.type][j]; + } for ( var i = 0; i < handlers.length; i++ ) { try { if ( handlers[i].constructor == Function ) { @@ -725,16 +793,18 @@ function handleEvent(event) { } catch(e){} } return returnValue; -}; +} function fixEvent(event) { event.preventDefault = fixEvent.preventDefault; event.stopPropagation = fixEvent.stopPropagation; return event; -}; +} + fixEvent.preventDefault = function() { this.returnValue = false; }; + fixEvent.stopPropagation = function() { this.cancelBubble = true; }; @@ -745,10 +815,11 @@ $.fn.text = function(e) { e = e || this.cur; var t = ""; for ( var j = 0; j < e.length; j++ ) { - for ( var i = 0; i < e[j].childNodes.length; i++ ) + 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; };