git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #7229 and #5803
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
8751860
..
30cecf3
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-70,7
+70,7
@@
jQuery.extend({
style: function( elem, name, value, extra ) {
// Don't set styles on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
style: function( elem, name, value, extra ) {
// Don't set styles on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
- return undefined;
+ return;
}
// Make sure that we're working with the right name
}
// Make sure that we're working with the right name
@@
-81,6
+81,11
@@
jQuery.extend({
// Check if we're setting a value
if ( value !== undefined ) {
// Check if we're setting a value
if ( value !== undefined ) {
+ // Make sure that NaN and null values aren't set. See: #7116
+ if ( typeof value === "number" && isNaN( value ) || value == null ) {
+ return;
+ }
+
// If a number was passed in, add 'px' to the (except for certain CSS properties)
if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
value += "px";
// If a number was passed in, add 'px' to the (except for certain CSS properties)
if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
value += "px";
@@
-88,7
+93,11
@@
jQuery.extend({
// If a hook was provided, use that value, otherwise just set the specified value
if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
// If a hook was provided, use that value, otherwise just set the specified value
if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
- style[ name ] = value;
+ // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+ // Fixes bug #5509
+ try {
+ style[ name ] = value;
+ } catch(e) {}
}
} else {
}
} else {
@@
-160,7
+169,19
@@
jQuery.each(["height", "width"], function( i, name ) {
});
}
});
}
- return val + "px";
+ if ( val <= 0 ) {
+ val = curCSS( elem, name, name );
+
+ if ( val != null ) {
+ return val === "auto" ? "" : val;
+ }
+ }
+
+ if ( val < 0 || val == null ) {
+ return elem.style[ name ];
+ }
+
+ return typeof val === "string" ? val : val + "px";
}
},
}
},
@@
-221,6
+242,9
@@
if ( getComputedStyle ) {
if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
ret = computedStyle.getPropertyValue( name );
if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
ret = computedStyle.getPropertyValue( name );
+ if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+ ret = jQuery.style( elem, name );
+ }
}
return ret;
}
return ret;