deac
/
jquery
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

1.7/enhancement_8685
jeresig 2011-03-24 22:10:38 -04:00
parent 23e8cc5608 735a949a06
commit ee81d4da92
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/css.js
View File

@ -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;
}
};