git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b985c4
)
Further fix for #3333, refactored marginRight css hook to use jQuery.swap and compute...
author
Richard Worth
<rdworth@gmail.com>
Thu, 24 Mar 2011 23:55:55 +0000
(19:55 -0400)
committer
Richard Worth
<rdworth@gmail.com>
Thu, 24 Mar 2011 23:55:55 +0000
(19:55 -0400)
src/css.js
patch
|
blob
|
history
diff --git
a/src/css.js
b/src/css.js
index
1e3f6c1
..
2eeef6c
100644
(file)
--- 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
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;
}
};
return ret;
}
};