Merge branch 'bug-3333' of https://github.com/rdworth/jquery

ee81d4da · jeresig · 23e8cc56 · 735a949a · ee81d4da
Commit ee81d4da authored Mar 25, 2011 by jeresig
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

css.js src/css.js +8 -5

No files found.
--- 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",
+				var ret;
-					display = elem.style.display;
+				jQuery.swap( elem, { "display": "inline-block" }, function() {
-				elem.style.display = "inline-block";
+					if ( computed ) {
-				ret = getComputedStyle( elem, "margin-right", "margin-right" );
+						ret = curCSS( elem, "margin-right", "marginRight" );
-				elem.style.display = display;
+					} else {
+						ret = elem.style.marginRight;
+					}
+				});
 				return ret;
 			}
 		};