github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #11119: The curCSS function needs only 2 arguments

Browse Source
This commit is contained in:
cmc3cn
2012-01-11 22:11:22 -05:00
committed by Dave Methvin
parent 77de76b942
commit 491d7e219b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/css.js
View File

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