git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Landing tweak from 'haruka' that fixes non-pixel fontSize values in IE. Fixes #760.
[jquery.git]
/
src
/
fx.js
diff --git
a/src/fx.js
b/src/fx.js
index
8025de4
..
801d92c
100644
(file)
--- a/
src/fx.js
+++ b/
src/fx.js
@@
-19,7
+19,7
@@
function genFx( type, num ){
jQuery.fn.extend({
show: function(speed,callback){
jQuery.fn.extend({
show: function(speed,callback){
- if ( speed ) {
+ if ( speed !== undefined ) {
return this.animate( genFx("show", 3), speed, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
return this.animate( genFx("show", 3), speed, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
@@
-59,7
+59,7
@@
jQuery.fn.extend({
},
hide: function(speed,callback){
},
hide: function(speed,callback){
- if ( speed ) {
+ if ( speed !== undefined ) {
return this.animate( genFx("hide", 3), speed, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
return this.animate( genFx("hide", 3), speed, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
@@
-109,6
+109,14
@@
jQuery.fn.extend({
self = this;
for ( p in prop ) {
self = this;
for ( p in prop ) {
+ var name = p.replace(rdashAlpha, fcamelCase);
+
+ if ( p !== name ) {
+ prop[ name ] = prop[ p ];
+ delete prop[ p ];
+ p = name;
+ }
+
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return opt.complete.call(this);
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return opt.complete.call(this);
@@
-156,6
+164,10
@@
jQuery.fn.extend({
}
});
}
});
+ if ( jQuery.isEmptyObject( prop ) ) {
+ return optall.complete.call(this);
+ }
+
// For JS strict compliance
return true;
});
// For JS strict compliance
return true;
});
@@
-412,3
+424,11
@@
jQuery.extend( jQuery.fx, {
}
}
});
}
}
});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+ jQuery.expr.filters.animated = function(elem){
+ return jQuery.grep(jQuery.timers, function(fn){
+ return elem === fn.elem;
+ }).length;
+ };
+}