X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=fx%2Ffx.js;h=ca7ebbb0b5daa679bafa802cad73340d5e9efa29;hb=d71a85001b0562ed05925e0c5635c3c0a1d52068;hp=f74c19a96e8302b2e964a19c9e00ef96950bcc84;hpb=329d1a3bb2abf5d64bd2fac5801034757619c950;p=jquery.git

diff --git a/fx/fx.js b/fx/fx.js
index f74c19a..ca7ebbb 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
+	})();}
+};