From: Richard Worth Date: Thu, 24 Mar 2011 23:55:55 +0000 (-0400) Subject: Further fix for #3333, refactored marginRight css hook to use jQuery.swap and compute... X-Git-Tag: 1.5.2~12^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=735a949a0649f0299e8e4d87b259290970a68ddf;p=jquery.git Further fix for #3333, refactored marginRight css hook to use jQuery.swap and computed. Thanks timmywil --- diff --git a/src/css.js b/src/css.js index 1e3f6c166..2eeef6cc9 100644 --- a/src/css.js +++ b/src/css.js @@ -248,11 +248,14 @@ jQuery(function() { get: function( elem, computed ) { // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right // Work around by temporarily setting element display to inline-block - var ret = "0px", - display = elem.style.display; - elem.style.display = "inline-block"; - ret = getComputedStyle( elem, "margin-right", "margin-right" ); - elem.style.display = display; + var ret; + jQuery.swap( elem, { "display": "inline-block" }, function() { + if ( computed ) { + ret = curCSS( elem, "margin-right", "marginRight" ); + } else { + ret = elem.style.marginRight; + } + }); return ret; } };