Skip to content
Permalink
Browse files
Fixes unit/css.js test fail in Safari 5. support.js test was passing …
…erroneously due to the body to which the div was attached having a width of 0
  • Loading branch information
timmywil committed Apr 12, 2011
1 parent 2b70893 commit 98da6b13bcc77dc117c68686ef4ed305bd83d400
Showing 2 changed files with 7 additions and 4 deletions.
@@ -8,6 +8,7 @@ jQuery.support = (function() {
select,
opt,
input,
marginDiv,
support,
fragment,
body,
@@ -190,10 +191,12 @@ jQuery.support = (function() {
// Fails in WebKit before Feb 2011 nightlies
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
if ( document.defaultView && document.defaultView.getComputedStyle ) {
div.style.width = "1px";
div.style.marginRight = "0";
marginDiv = document.createElement('div');
marginDiv.style.width = "0";
marginDiv.style.marginRight = "0";
div.appendChild( marginDiv );
support.reliableMarginRight =
( parseInt( document.defaultView.getComputedStyle(div).marginRight, 10 ) || 0 ) === 0;
( parseInt( document.defaultView.getComputedStyle( marginDiv ).marginRight, 10 ) || 0 ) === 0;
}

// Remove the body element we added
@@ -375,5 +375,5 @@ test("marginRight computed style (bug #3333)", function() {
marginRight: 0
});

equals($div.css("marginRight"), "0px");
equals($div.css("marginRight"), "0px", "marginRight correctly calculated with a width and display block");
});

0 comments on commit 98da6b1

Please sign in to comment.