git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some errors in the formvalues() function
[jquery.git]
/
fx
/
fx.js
diff --git
a/fx/fx.js
b/fx/fx.js
index
3eb8945
..
c7979fa
100644
(file)
--- 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(){
$.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(){
}) : 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();
};
}) : this._show();
};
@@
-81,12
+90,14
@@
$.setAuto = function(e,p) {
/*
* I originally wrote fx() as a clone of moo.fx and in the process
/*
* 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;
* 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);};
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.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 = {
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() {
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;
};
}
e.opacity = o.now;
};
- o.io = o.now = 1;
+ o.io = o.now = (sv || o.cur());
o.a();
return o;
};
o.a();
return o;
};
@@
-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 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);};
for(var i in $.fx.fn){(function(){
var j = $.fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);};