Commit d71a8500 authored by John Resig's avatar John Resig

jQuery is now JSLint (jslint.com) compatible, save for the eval stuff. Can't there b

e legitamite uses for eval?
parent 329d1a3b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// http://jquery.com/docs/ajax/ // http://jquery.com/docs/ajax/
if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'function') { if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'function') {
var XMLHttpRequest = function() { XMLHttpRequest = function() {
return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ? return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ?
"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"); "Microsoft.XMLHTTP" : "Msxml2.XMLHTTP");
}; };
...@@ -23,15 +23,17 @@ $.xml = function( type, url, data, ret ) { ...@@ -23,15 +23,17 @@ $.xml = function( type, url, data, ret ) {
// //
// Show loader if needed // Show loader if needed
if ($.xmlCreate) if ($.xmlCreate) {
$.xmlCreate(); $.xmlCreate();
}
// //
// Open the socket // Open the socket
xml.open(type || "GET", url, true); xml.open(type || "GET", url, true);
if ( data ) if ( data ) {
xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
}
// //
// Set header so calling script knows that it's an XMLHttpRequest // Set header so calling script knows that it's an XMLHttpRequest
...@@ -41,12 +43,13 @@ $.xml = function( type, url, data, ret ) { ...@@ -41,12 +43,13 @@ $.xml = function( type, url, data, ret ) {
* a bug where XMLHttpReqeuest sends an incorrect Content-length * a bug where XMLHttpReqeuest sends an incorrect Content-length
* header. See Mozilla Bugzilla #246651. * header. See Mozilla Bugzilla #246651.
*/ */
if ( xml.overrideMimeType ) if ( xml.overrideMimeType ) {
xml.setRequestHeader('Connection', 'close'); xml.setRequestHeader('Connection', 'close');
}
xml.onreadystatechange = function() { xml.onreadystatechange = function() {
if ( xml.readyState == 4 ) { if ( xml.readyState == 4 ) {
if ( ret ) ret(xml); if ( ret ) { ret(xml); }
// //
// Decrease counter // Decrease counter
...@@ -55,13 +58,14 @@ $.xml = function( type, url, data, ret ) { ...@@ -55,13 +58,14 @@ $.xml = function( type, url, data, ret ) {
// //
// Hide loader if needed // Hide loader if needed
if ($.xmlActive <= 0) { if ($.xmlActive <= 0) {
if ($.xmlDestroy) if ($.xmlDestroy) {
$.xmlDestroy(); $.xmlDestroy();
}
} }
} }
}; };
xml.send(data) xml.send(data);
} }
}; };
...@@ -72,7 +76,7 @@ $.httpData = function(r,type) { ...@@ -72,7 +76,7 @@ $.httpData = function(r,type) {
$.get = function( url, ret, type ) { $.get = function( url, ret, type ) {
$.xml( "GET", url, null, function(r) { $.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 ) { ...@@ -82,7 +86,7 @@ $.getXML = function( url, ret ) {
$.post = function( url, data, ret, type ) { $.post = function( url, data, ret, type ) {
$.xml( "POST", url, $.param(data), function(r) { $.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 ) { ...@@ -93,11 +97,13 @@ $.postXML = function( url, data, ret ) {
$.param = function(a) { $.param = function(a) {
var s = []; var s = [];
if (a && typeof a == 'object' && a.constructor == Array) { if (a && typeof a == 'object' && a.constructor == Array) {
for ( var i=0; i < a.length; i++ ) for ( var i=0; i < a.length; i++ ) {
s[s.length] = a[i]['name'] + "=" + encodeURIComponent( a[i]['value'] ); s[s.length] = a[i].name + "=" + encodeURIComponent( a[i].value );
}
} else { } else {
for ( var i in a ) for ( var j in a ) {
s[s.length] = i + "=" + encodeURIComponent( a[i] ); s[s.length] = j + "=" + encodeURIComponent( a[j] );
}
} }
return s.join("&"); return s.join("&");
}; };
...@@ -106,27 +112,28 @@ $.fn.load = function(a,o,f) { ...@@ -106,27 +112,28 @@ $.fn.load = function(a,o,f) {
// Arrrrghhhhhhhh!! // Arrrrghhhhhhhh!!
// I overwrote the event plugin's .load // I overwrote the event plugin's .load
// this won't happen again, I hope -John // this won't happen again, I hope -John
if ( a && a.constructor == Function ) if ( a && a.constructor == Function ) {
return this.bind("load", a); return this.bind("load", a);
}
var t = "GET"; var t = "GET";
if ( o && o.constructor == Function ) { if ( o && o.constructor == Function ) {
f = o; f = o;
o = null; o = null;
} }
if (o != null) { if (o !== null) {
o = $.param(o); o = $.param(o);
t = "POST"; t = "POST";
} }
var self = this; var self = this;
$.xml(t,a,o,function(h){ $.xml(t,a,o,function(h){
var h = h.responseText; h = h.responseText;
self.html(h).find("script").each(function(){ self.html(h).find("script").each(function(){
try { try {
eval( this.text || this.textContent || this.innerHTML ); eval( this.text || this.textContent || this.innerHTML );
} catch(e){} } catch(e){}
}); });
if(f)f(h); if(f){f(h);}
}); });
return this; return this;
}; };
...@@ -137,12 +144,11 @@ $.fn.load = function(a,o,f) { ...@@ -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!) * docs: Gets the form values and creates a key=>value array of the found values (only for ENABLED elements!)
*/ */
$.fn.formValues = function() { $.fn.formValues = function() {
var a = new Array(); var a = [];
this.find("input[@type='submit'],input[@type='hidden'],textarea,input[@checked],input[@type='password'],input[@type='text'],option[@selected]") this.find("input[@type='submit'],input[@type='hidden'],textarea,input[@checked],input[@type='password'],input[@type='text'],option[@selected]").filter(":enabled").each(function() {
.filter(":enabled").each(function() {
o = {}; o = {};
o['name'] = this.name || this.id || this.parentNode.name || this.parentNode.id; o.name = this.name || this.id || this.parentNode.name || this.parentNode.id;
o['value'] = this.value; o.value = this.value;
a.push(o); a.push(o);
}); });
return a; return a;
...@@ -169,6 +175,6 @@ $.update = function(objElement, strURL, arrValues, fncCallback) { ...@@ -169,6 +175,6 @@ $.update = function(objElement, strURL, arrValues, fncCallback) {
// //
// Callback handler // Callback handler
if (fncCallback) fncCallback(); if (fncCallback) { fncCallback(); }
}); });
}; };
...@@ -10,7 +10,7 @@ for ( var i = 0; i < e.length; i++ ) { ...@@ -10,7 +10,7 @@ for ( var i = 0; i < e.length; i++ ) {
$.fn["un"+o] = function(f){ return this.unbind(o, f); }; $.fn["un"+o] = function(f){ return this.unbind(o, f); };
$.fn["do"+o] = function(){ return this.trigger(o); }; $.fn["do"+o] = function(){ return this.trigger(o); };
$.fn["one"+o] = function(f){ return this.bind(o, function(e){ $.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]++; this[o+f]++;
return $.apply(this,f,[e]); return $.apply(this,f,[e]);
}); }; }); };
...@@ -25,15 +25,15 @@ $.fn.hover = function(f,g) { ...@@ -25,15 +25,15 @@ $.fn.hover = function(f,g) {
return this.each(function(){ return this.each(function(){
var obj = this; var obj = this;
addEvent(this, "mouseover", function(e) { addEvent(this, "mouseover", function(e) {
var p = ( e.fromElement != null ? e.fromElement : e.relatedTarget ); var p = ( e.fromElement !== null ? e.fromElement : e.relatedTarget );
while ( p && p != obj ) p = p.parentNode; while ( p && p != obj ) { p = p.parentNode; }
if ( p == obj ) return false; if ( p == obj ) { return false; }
return $.apply(obj,f,[e]); return $.apply(obj,f,[e]);
}); });
addEvent(this, "mouseout", function(e) { addEvent(this, "mouseout", function(e) {
var p = ( e.toElement != null ? e.toElement : e.relatedTarget ); var p = ( e.toElement !== null ? e.toElement : e.relatedTarget );
while ( p && p != obj ) p = p.parentNode; while ( p && p != obj ) { p = p.parentNode; }
if ( p == obj ) return false; if ( p == obj ) { return false; }
return $.apply(obj,g,[e]); return $.apply(obj,g,[e]);
}); });
}); });
...@@ -43,17 +43,19 @@ $.fn.hover = function(f,g) { ...@@ -43,17 +43,19 @@ $.fn.hover = function(f,g) {
$.fn.onhover = $.fn.hover; $.fn.onhover = $.fn.hover;
$.ready = function() { $.ready = function() {
if ( $.$$timer ) { if ( $.$$timer ) {
clearInterval( $.$$timer ); clearInterval( $.$$timer );
$.$$timer = null; $.$$timer = null;
for ( var i = 0; i < $.$$ready.length; i++ ) for ( var i = 0; i < $.$$ready.length; i++ ) {
$.apply( document, $.$$ready[i] ); $.apply( document, $.$$ready[i] );
$.$$ready = null; }
} $.$$ready = null;
}
}; };
if ( document.addEventListener ) if ( document.addEventListener ) {
document.addEventListener( "DOMContentLoaded", $.ready, null ); document.addEventListener( "DOMContentLoaded", $.ready, null );
}
addEvent( window, "load", $.ready ); addEvent( window, "load", $.ready );
...@@ -62,11 +64,12 @@ $.fn.ready = function(f) { ...@@ -62,11 +64,12 @@ $.fn.ready = function(f) {
if ( $.$$timer ) { if ( $.$$timer ) {
$.$$ready.push( f ); $.$$ready.push( f );
} else { } else {
var o = this; var o = this;
$.$$ready = [ f ]; $.$$ready = [ f ];
$.$$timer = setInterval( function(){ $.$$timer = setInterval( function(){
if ( o && o.getElementsByTagName && o.getElementById && o.body ) if ( o && o.getElementsByTagName && o.getElementById && o.body ) {
$.ready(); $.ready();
}
}, 10 ); }, 10 );
} }
}); });
...@@ -81,4 +84,4 @@ $.fn.toggle = function(a,b) { ...@@ -81,4 +84,4 @@ $.fn.toggle = function(a,b) {
e.preventDefault(); e.preventDefault();
return $.apply( this, this.$$last, [e] ) || false; return $.apply( this, this.$$last, [e] ) || false;
}) : this._toggle(); }) : this._toggle();
}; };
\ No newline at end of file
$.speed = function(s,o) { $.speed = function(s,o) {
if ( o && o.constructor == Function ) o = { onComplete: o }; if ( o && o.constructor == Function ) { o = { onComplete: o }; }
o = o || {}; o = o || {};
var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400}; 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; o.duration = typeof s == "number" ? s : ss[s] || 400;
...@@ -59,11 +59,12 @@ $.fn.center = function(f) { ...@@ -59,11 +59,12 @@ $.fn.center = function(f) {
} else { } else {
var s = this.style; var s = this.style;
var p = this.parentNode; var p = this.parentNode;
if ( $.css(p,"position") == 'static' ) if ( $.css(p,"position") == 'static' ) {
p.style.position = 'relative'; p.style.position = 'relative';
}
s.position = 'absolute'; s.position = 'absolute';
s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2) + "px"; s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2, 10) + "px";
s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2) + "px"; s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2, 10) + "px";
} }
}); });
}; };
...@@ -73,8 +74,9 @@ $.setAuto = function(e,p) { ...@@ -73,8 +74,9 @@ $.setAuto = function(e,p) {
var o = $.css(e,p); var o = $.css(e,p);
e.style[p] = 'auto'; e.style[p] = 'auto';
var n = $.css(e,p); var n = $.css(e,p);
if ( o != n ) if ( o != n ) {
e.style[p] = a; e.style[p] = a;
}
}; };
/* /*
...@@ -85,15 +87,15 @@ $.setAuto = function(e,p) { ...@@ -85,15 +87,15 @@ $.setAuto = function(e,p) {
function fx(el,op,ty,tz){ function fx(el,op,ty,tz){
var z = this; var z = this;
z.a = function(){z.el.style[ty]=z.now+z.o.unit}; 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.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.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.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.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.ss = function(a){if(y.display!=a){y.display=a;}};
z.toggle = function(){if(z.cur()>0)z.hide();else z.show()}; z.toggle = function(){if(z.cur()>0){z.hide();}else{z.show();}};
z.modify = function(a){z.custom(z.cur(),z.cur()+a)}; z.modify = function(a){z.custom(z.cur(),z.cur()+a);};
z.clear = function(){clearInterval(z.timer);z.timer=null}; z.clear = function(){clearInterval(z.timer);z.timer=null;};
z.el = el.constructor==String?document.getElementById(el):el; z.el = el.constructor==String?document.getElementById(el):el;
var y = z.el.style; var y = z.el.style;
z.oo = y.overflow; z.oo = y.overflow;
...@@ -104,44 +106,48 @@ function fx(el,op,ty,tz){ ...@@ -104,44 +106,48 @@ function fx(el,op,ty,tz){
onComplete: (op && op.onComplete) || op onComplete: (op && op.onComplete) || op
}; };
z.step = function(f,tt){ z.step = function(f,tt){
var t = (new Date).getTime(); var t = (new Date()).getTime();
var p = (t - z.s) / z.o.duration; var p = (t - z.s) / z.o.duration;
if (t >= z.o.duration+z.s) { if (t >= z.o.duration+z.s) {
z.now = tt; z.now = tt;
z.clear(); z.clear();
setTimeout(function(){ setTimeout(function(){
y.overflow = z.oo; 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 ) { if ( ty != "opacity" && z.o.auto ) {
$.setAuto( z.el, "height" ); $.setAuto( z.el, "height" );
$.setAuto( z.el, "width" ); $.setAuto( z.el, "width" );
} }
if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();} if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
},13); },13);
} else } else {
z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (tt-f) + f; z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (tt-f) + f;
}
z.a(); z.a();
}; };
z.custom = function(f,t){ 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); z.timer=setInterval(function(){z.step(f,t);}, 13);
}; };
} }
fx.fn = ["show","hide","toggle"]; fx.fn = ["show","hide","toggle"];
fx.ty = ["Height","Width","Left","Top"]; fx.ty = ["Height","Width","Left","Top"];
for(var i in fx.ty){(function(){ for(var $i in fx.ty){(function(){
var c = fx.ty[i]; var c = fx.ty[$i];
fx[c] = function(a,b){ 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){ fx.Opacity = function(a,b){
var o = new fx(a,b,"opacity"); var o = new fx(a,b,"opacity");
o.cur = function(){return parseFloat(o.el.style.opacity);}; o.cur = function(){return parseFloat(o.el.style.opacity);};
o.a = function() { o.a = function() {
var e = o.el.style; var e = o.el.style;
if (o.now == 1) o.now = 0.9999; if (o.now == 1) { o.now = 0.9999; }
if (window.ActiveXObject) if (window.ActiveXObject) {
e.filter = "alpha(opacity=" + o.now*100 + ")"; e.filter = "alpha(opacity=" + o.now*100 + ")";
}
e.opacity = o.now; e.opacity = o.now;
}; };
o.io = o.now = 1; o.io = o.now = 1;
...@@ -151,16 +157,16 @@ fx.Opacity = function(a,b){ ...@@ -151,16 +157,16 @@ fx.Opacity = function(a,b){
fx.Resize = function(e,o){ fx.Resize = function(e,o){
var z = this; var z = this;
var h = new fx.Height(e,o); var h = new fx.Height(e,o);
if(o) o.onComplete = null; if(o) { o.onComplete = null; }
var w = new fx.Width(e,o); 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(){ for(var i in fx.fn){(function(){
var j = fx.fn[i]; var j = fx.fn[i];
z[j] = function(a,b){ z[j] = function(a,b){
if(c(a,b,"height")) h[j](); if(c(a,b,"height")) { h[j](); }
if(c(a,b,"width")) w[j](); if(c(a,b,"width")) { w[j](); }
}; };
})()} })();}
z.modify = function(c,d){ z.modify = function(c,d){
h.modify(c); h.modify(c);
w.modify(d); w.modify(d);
...@@ -169,10 +175,10 @@ fx.Resize = function(e,o){ ...@@ -169,10 +175,10 @@ fx.Resize = function(e,o){
fx.FadeSize = function(e,o){ fx.FadeSize = function(e,o){
var z = this; var z = this;
var r = new fx.Resize(e,o); var r = new fx.Resize(e,o);
if(o) o.onComplete = null; if(o) { o.onComplete = null; }
var p = new fx.Opacity(e,o); var p = new fx.Opacity(e,o);
for(var i in fx.fn){(function(){ for(var i in fx.fn){(function(){
var j = fx.fn[i]; var j = fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);}; z[j] = function(a,b){p[j]();r[j](a,b);};
})()} })();}
}; };
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment