fx.js
-----
added: $.fn.fadeTo
Also changed ' fx.Opacity ' function so $.fn.fadeTo works. For this i changed one line, and one parameter in $.fx.Opactity:
"o.io = o.now = 1;"
became:
"o.io = o.now = (sv || o.cur());"

e.g. if there is a start value use it. Else, the current value is used. All calls to "$.fx.Opactiy" which where present in the code have now "1" as third parameter so the code doesn't break.

---------
jquery.js
---------
Changed line 401 to fix ' name="id" ' bug:
'#': "a.id == m[2]"
to:
'#': "a.getAttribute('id') == m[2]"
This commit is contained in:
Gilles van den Hoven 2006-05-27 10:18:18 +00:00
parent d8bad24d34
commit 497bfb7909
2 changed files with 16 additions and 7 deletions

View file

@ -37,14 +37,23 @@ $.fn.slideUp = function(a,o) {
$.fn.fadeOut = function(a,o) { $.fn.fadeOut = function(a,o) {
o = $.speed(a,o); o = $.speed(a,o);
return a ? this.each(function(){ return a ? this.each(function(){
new $.fx.Opacity(this,o).hide(); new $.fx.Opacity(this,o,1).hide();
}) : this._hide(); }) : this._hide();
}; };
$.fn.fadeIn = function(a,o) { $.fn.fadeIn = function(a,o) {
o = $.speed(a,o); o = $.speed(a,o);
return a ? this.each(function(){ 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,7 +90,7 @@ $.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. * people. You've been warned.
*/ */
@ -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"); 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() {
@ -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(); o.a();
return o; return o;
}; };
@ -181,7 +190,7 @@ $.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,1);
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);};

2
jquery/jquery.js vendored
View file

@ -398,7 +398,7 @@ $.clean = function(a) {
$.g = { $.g = {
'': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()", '': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
'#': "a.id == m[2]", '#': "a.getAttribute('id') == m[2]",
':': { ':': {
lt: "i < m[3]-0", lt: "i < m[3]-0",
gt: "i > m[3]-0", gt: "i > m[3]-0",