git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making some more adjustments to handle auto CSS properties.
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
dd0ca4e
..
eb7567f
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-77,7
+77,7
@@
jQuery.extend({
} else if ( !force && style[ name ] ) {
ret = style[ name ];
} else if ( !force && style[ name ] ) {
ret = style[ name ];
- } else if ( curCSS ) {
+ } else if ( force !== false && curCSS ) {
ret = curCSS( elem, name, origName );
}
ret = curCSS( elem, name, origName );
}
@@
-123,7
+123,11
@@
jQuery.each(["height", "width"], function( i, name ) {
set: function( elem, value ) {
// ignore negative width and height values #1599
set: function( elem, value ) {
// ignore negative width and height values #1599
- return Math.max( parseFloat(value), 0 ) + "px";
+ value = parseFloat(value);
+
+ if ( value >= 0 ) {
+ return value + "px";
+ }
}
};
});
}
};
});