git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'explain-map-concat' of https://github.com/ajpiano/jquery into ajpiano...
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
4665fa7
..
8a83c60
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-177,13
+177,18
@@
jQuery.each(["height", "width"], function( i, name ) {
}
if ( val != null ) {
}
if ( val != null ) {
- return val === "" ? "auto" : val;
+ // Should return "auto" instead of 0, use 0 for
+ // temporary backwards-compat
+ return val === "" || val === "auto" ? "0px" : val;
}
}
if ( val < 0 || val == null ) {
val = elem.style[ name ];
}
}
if ( val < 0 || val == null ) {
val = elem.style[ name ];
- return val === "" ? "auto" : val;
+
+ // Should return "auto" instead of 0, use 0 for
+ // temporary backwards-compat
+ return val === "" || val === "auto" ? "0px" : val;
}
return typeof val === "string" ? val : val + "px";
}
return typeof val === "string" ? val : val + "px";