git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test for passing null to .show()
[jquery.git]
/
src
/
fx.js
diff --git
a/src/fx.js
b/src/fx.js
index
65bb3f1
..
c34b856
100644
(file)
--- a/
src/fx.js
+++ b/
src/fx.js
@@
-28,12
+28,12
@@
jQuery.fn.extend({
this[i].style.display = old || "";
if ( jQuery.css(this[i], "display") === "none" ) {
this[i].style.display = old || "";
if ( jQuery.css(this[i], "display") === "none" ) {
- var tagName = this[i].tagName, display;
+ var nodeName = this[i].nodeName, display;
- if ( elemdisplay[ tagName ] ) {
- display = elemdisplay[ tagName ];
+ if ( elemdisplay[ nodeName ] ) {
+ display = elemdisplay[ nodeName ];
} else {
} else {
- var elem = jQuery("<" + tagName + " />").appendTo("body");
+ var elem = jQuery("<" + nodeName + " />").appendTo("body");
display = elem.css("display");
if ( display === "none" )
display = elem.css("display");
if ( display === "none" )
@@
-41,7
+41,7
@@
jQuery.fn.extend({
elem.remove();
elem.remove();
- elemdisplay[ tagName ] = display;
+ elemdisplay[ nodeName ] = display;
}
jQuery.data(this[i], "olddisplay", display);
}
jQuery.data(this[i], "olddisplay", display);
@@
-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;
+ };
+}