Skip to content
Permalink
Browse files

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

  • Loading branch information...
jeresig committed Mar 25, 2011
2 parents 23e8cc5 + 735a949 commit ee81d4da920ffeddff4e47ee09ca1a63b33768b4
Showing with 8 additions and 5 deletions.
  1. +8 −5 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;
}
};

0 comments on commit ee81d4d

Please sign in to comment.
You can’t perform that action at this time.