diff options
| author | timmywil <timmywillisn@gmail.com> | 2011-11-01 09:46:20 -0400 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-11-01 09:46:20 -0400 |
| commit | 52afe20860c4082165b7a9f2184fa1851f7e3fb0 (patch) | |
| tree | 8b78d4cbfb1149c1d6f6a5524134d2d38946755f /src/css.js | |
| parent | 006fde228da59ae71c11a67ef65dbfc09e788773 (diff) | |
| download | jquery-52afe20860c4082165b7a9f2184fa1851f7e3fb0.tar.gz jquery-52afe20860c4082165b7a9f2184fa1851f7e3fb0.zip | |
Fix a failing effects test in IE; minor style changes in effects
Diffstat (limited to 'src/css.js')
| -rw-r--r-- | src/css.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/css.js b/src/css.js index ea1037ded..3e14e1be3 100644 --- a/src/css.js +++ b/src/css.js @@ -285,12 +285,14 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { if ( document.documentElement.currentStyle ) { currentStyle = function( elem, name ) { - var left, rsLeft, + var left, rsLeft, uncomputed, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style; - if ( ret === null && style ) { - ret = style[ name ]; + // Avoid setting ret to empty string here + // so we don't default to auto + if ( ret === null && style && (uncomputed = style[ name ]) ) { + ret = uncomputed; } // From the awesome hack by Dean Edwards |