From 8099cdce800d45109b961e3521fc0080e9a876c6 Mon Sep 17 00:00:00 2001 From: rwldrn Date: Wed, 5 Jan 2011 13:32:59 -0500 Subject: [PATCH 1/2] Bug #7608 elem.runtimeStyle throws exception in Opera --- src/css.js | 12 ++++++++---- test/unit/css.js | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/css.js b/src/css.js index 8a83c6072..19c6342d2 100644 --- a/src/css.js +++ b/src/css.js @@ -263,8 +263,9 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { if ( document.documentElement.currentStyle ) { currentStyle = function( elem, name ) { - var left, rsLeft, + var left, ret = elem.currentStyle && elem.currentStyle[ name ], + rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ], style = elem.style; // From the awesome hack by Dean Edwards @@ -275,16 +276,19 @@ if ( document.documentElement.currentStyle ) { if ( !rnumpx.test( ret ) && rnum.test( ret ) ) { // Remember the original values left = style.left; - rsLeft = elem.runtimeStyle.left; // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; + if ( rsLeft ) { + elem.runtimeStyle.left = elem.currentStyle.left; + } style.left = name === "fontSize" ? "1em" : (ret || 0); ret = style.pixelLeft + "px"; // Revert the changed values style.left = left; - elem.runtimeStyle.left = rsLeft; + if ( rsLeft ) { + elem.runtimeStyle.left = rsLeft; + } } return ret === "" ? "auto" : ret; diff --git a/test/unit/css.js b/test/unit/css.js index fbbf937ca..edc340ceb 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -320,3 +320,25 @@ test(":visible selector works properly on children with a hidden parent (bug #45 jQuery('#table').css('display', 'none').html('cellcell'); equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible"); }); + +test("internal ref to elem.runtimeStyle (bug #7608)", function () { + expect(1); + + var result = true, + val = 10; + + jQuery('
' + + '
 
').appendTo("body"); + + try { + // the bug is located within src/css.js + jQuery("#bug7608 #test").animate( { width: val }, 1000); + + } catch (e) { + result = false; + } + + ok( result, "elem.runtimeStyle does not throw exception" ); + + jQuery("#bug7608").remove(); +}); From 9bd9d270f69582b119b1835da4419a900f975b6b Mon Sep 17 00:00:00 2001 From: rwldrn Date: Mon, 10 Jan 2011 13:17:08 -0500 Subject: [PATCH 2/2] whitespace fixes in unit tests --- test/unit/css.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/unit/css.js b/test/unit/css.js index edc340ceb..3e65b5131 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -322,23 +322,23 @@ test(":visible selector works properly on children with a hidden parent (bug #45 }); test("internal ref to elem.runtimeStyle (bug #7608)", function () { - expect(1); - - var result = true, - val = 10; + expect(1); - jQuery('
' + - '
 
').appendTo("body"); - - try { - // the bug is located within src/css.js - jQuery("#bug7608 #test").animate( { width: val }, 1000); - - } catch (e) { - result = false; - } + var result = true, + val = 10; + + jQuery('
' + + '
 
').appendTo("#main"); + + try { + // the bug is located within src/css.js + jQuery("#bug7608 #test").animate( { width: val }, 1000); + + } catch (e) { + result = false; + } + + ok( result, "elem.runtimeStyle does not throw exception" ); - ok( result, "elem.runtimeStyle does not throw exception" ); - - jQuery("#bug7608").remove(); + jQuery("#bug7608").remove(); });