Skip to content
Browse files

Opera doesn't give height/width of display: none elements with getCom…

…putedStyle but does with currentStyle - fall back to that if it exists.
  • Loading branch information...
1 parent 62c83a7 commit fb4445070cd9e06929c7b6f27c10dbf42d4a3367 @jeresig jeresig committed Nov 3, 2010
Showing with 13 additions and 6 deletions.
  1. +13 −6 src/css.js
View
19 src/css.js
@@ -12,8 +12,8 @@ var ralpha = /alpha\([^)]*\)/i,
cssHeight = [ "Top", "Bottom" ],
curCSS,
- // cache check for defaultView.getComputedStyle
- getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
+ getComputedStyle,
+ currentStyle,
fcamelCase = function( all, letter ) {
return letter.toUpperCase();
@@ -172,6 +172,10 @@ jQuery.each(["height", "width"], function( i, name ) {
if ( val <= 0 ) {
val = curCSS( elem, name, name );
+ if ( val === "0px" && currentStyle ) {
+ val = currentStyle( elem, name, name );
+ }
+
if ( val != null ) {
return val;
}
@@ -231,8 +235,8 @@ if ( !jQuery.support.opacity ) {
};
}
-if ( getComputedStyle ) {
- curCSS = function( elem, newName, name ) {
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+ getComputedStyle = function( elem, newName, name ) {
var ret, defaultView, computedStyle;
name = name.replace( rupper, "-$1" ).toLowerCase();
@@ -250,9 +254,10 @@ if ( getComputedStyle ) {
return ret === "" ? "auto" : ret;
};
+}
-} else if ( document.documentElement.currentStyle ) {
- curCSS = function( elem, name ) {
+if ( document.documentElement.currentStyle ) {
+ currentStyle = function( elem, name ) {
var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style;
// From the awesome hack by Dean Edwards
@@ -279,6 +284,8 @@ if ( getComputedStyle ) {
};
}
+curCSS = getComputedStyle || currentStyle;
+
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;

2 comments on commit fb44450

@jitter
jitter commented on fb44450 Nov 3, 2010

Seems like the fix for the bug I reported in #7336

@jdalton
jQuery Foundation member
jdalton commented on fb44450 Nov 3, 2010

I dig the fallback. Does this create an inconsistent behavior where browsers with currentStyle can resolve hidden element's height/width and those with just getComputedStyle cant?

Please sign in to comment.
Something went wrong with that request. Please try again.