diff options
| author | cmc3cn <59194618@qq.com> | 2012-01-11 22:11:22 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-01-11 22:11:22 -0500 |
| commit | 491d7e219b595f8f4be1087ec73c256e1849711e (patch) | |
| tree | 712b0bd74c31222a1a865fd150c9eda78295df81 | |
| parent | 77de76b942bf6bde5cf17ddad15b03049c92e6be (diff) | |
| download | jquery-491d7e219b595f8f4be1087ec73c256e1849711e.tar.gz jquery-491d7e219b595f8f4be1087ec73c256e1849711e.zip | |
Fix #11119: The curCSS function needs only 2 arguments
| -rw-r--r-- | src/css.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/css.js b/src/css.js index 8d63466ed..68b8098b0 100644 --- a/src/css.js +++ b/src/css.js @@ -35,7 +35,7 @@ jQuery.extend({ get: function( elem, computed ) { if ( computed ) { // We should always get a number back from opacity - var ret = curCSS( elem, "opacity", "opacity" ); + var ret = curCSS( elem, "opacity" ); return ret === "" ? "1" : ret; } else { @@ -264,7 +264,7 @@ function getWidthOrHeight( elem, name, extra ) { } // Fall back to computed then uncomputed css if necessary - val = curCSS( elem, name, name ); + val = curCSS( elem, name ); if ( val < 0 || val == null ) { val = elem.style[ name ]; } @@ -366,7 +366,7 @@ jQuery(function() { // Work around by temporarily setting element display to inline-block return jQuery.swap( elem, { "display": "inline-block" }, function() { if ( computed ) { - return curCSS( elem, "margin-right", "marginRight" ); + return curCSS( elem, "margin-right" ); } else { return elem.style.marginRight; } |