X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=fx%2Ffx.js;h=d2bb89d0da170fb44cb9cc63add7f68458733b16;hb=4b6bcb235fc4ae30692d27910dffbf79295e36f4;hp=3eb89458305a46334e23d1e53f0be6e2594c4bd6;hpb=4986837802a65ced713c2dac2ff7d80e42fd7807;p=jquery.git

diff --git a/fx/fx.js b/fx/fx.js
index 3eb8945..d2bb89d 100644
--- a/fx/fx.js
+++ b/fx/fx.js
@@ -37,14 +37,23 @@ $.fn.slideUp = function(a,o) {
 $.fn.fadeOut = function(a,o) {
 	o = $.speed(a,o);
 	return a ? this.each(function(){
-		new $.fx.Opacity(this,o).hide();
+		new $.fx.Opacity(this,o,1).hide();
 	}) : this._hide();
 };
 
 $.fn.fadeIn = function(a,o) {
 	o = $.speed(a,o);
 	return a ? this.each(function(){
-		new $.fx.Opacity(this,o).show();
+		new $.fx.Opacity(this,o,1).show();
+	}) : this._show();
+};
+
+$.fn.fadeTo = function(a,ev,o) {
+	o = $.speed(a,o);
+	return a ? this.each(function(){
+		ef = new $.fx.Opacity(this,o);
+		ef.custom(ef.cur(),parseFloat(ev));
+		ef.show();
 	}) : this._show();
 };
 
@@ -81,12 +90,14 @@ $.setAuto = function(e,p) {
 
 /*
  * I originally wrote fx() as a clone of moo.fx and in the process
- * of making it small in size the code became illegible to sane 
+ * of making it small in size the code became illegible to sane
  * people. You've been warned.
  */
 
 $.fx = function(el,op,ty,tz){
 	var z = this;
+	z.el = el.constructor==String?document.getElementById(el):el;
+	var y = z.el.style;
 	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);};
@@ -96,8 +107,6 @@ $.fx = function(el,op,ty,tz){
 	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;
 	y.overflow = "hidden";
 	z.o = {
@@ -144,7 +153,7 @@ $.fx.ty = ["Height","Width","Left","Top"];
 	})();}
 })();
 
-$.fx.Opacity = function(a,b){
+$.fx.Opacity = function(a,b,sv){
 	var o = new $.fx(a,b,"opacity");
 	o.cur = function(){return parseFloat(o.el.style.opacity);};
 	o.a = function() {
@@ -155,7 +164,7 @@ $.fx.Opacity = function(a,b){
 		}
 		e.opacity = o.now;
 	};
-	o.io = o.now = 1;
+	o.io = o.now = (sv || o.cur());
 	o.a();
 	return o;
 };
@@ -164,7 +173,7 @@ $.fx.Resize = function(e,o){
 	var h = new $.fx.Height(e,o);
 	if(o) { o.onComplete = null; }
 	var w = new $.fx.Width(e,o);
-	function c(a,b,d){return (!a||a==c||b==d);}
+	function c(a,b,d){return (!a||a==d||b==d);}
 	for(var i in $.fx.fn){(function(){
 		var j = $.fx.fn[i];
 		z[j] = function(a,b){
@@ -181,7 +190,7 @@ $.fx.FadeSize = function(e,o){
 	var z = this;
 	var r = new $.fx.Resize(e,o);
 	if(o) { o.onComplete = null; }
-	var p = new $.fx.Opacity(e,o);
+	var p = new $.fx.Opacity(e,o,1);
 	for(var i in $.fx.fn){(function(){
 		var j = $.fx.fn[i];
 		z[j] = function(a,b){p[j]();r[j](a,b);};