Commit 491d7e21 authored by cmc3cn's avatar cmc3cn Committed by Dave Methvin

Fix #11119: The curCSS function needs only 2 arguments

parent 77de76b9
...@@ -35,7 +35,7 @@ jQuery.extend({ ...@@ -35,7 +35,7 @@ jQuery.extend({
get: function( elem, computed ) { get: function( elem, computed ) {
if ( computed ) { if ( computed ) {
// We should always get a number back from opacity // We should always get a number back from opacity
var ret = curCSS( elem, "opacity", "opacity" ); var ret = curCSS( elem, "opacity" );
return ret === "" ? "1" : ret; return ret === "" ? "1" : ret;
} else { } else {
...@@ -264,7 +264,7 @@ function getWidthOrHeight( elem, name, extra ) { ...@@ -264,7 +264,7 @@ function getWidthOrHeight( elem, name, extra ) {
} }
// Fall back to computed then uncomputed css if necessary // Fall back to computed then uncomputed css if necessary
val = curCSS( elem, name, name ); val = curCSS( elem, name );
if ( val < 0 || val == null ) { if ( val < 0 || val == null ) {
val = elem.style[ name ]; val = elem.style[ name ];
} }
...@@ -366,7 +366,7 @@ jQuery(function() { ...@@ -366,7 +366,7 @@ jQuery(function() {
// Work around by temporarily setting element display to inline-block // Work around by temporarily setting element display to inline-block
return jQuery.swap( elem, { "display": "inline-block" }, function() { return jQuery.swap( elem, { "display": "inline-block" }, function() {
if ( computed ) { if ( computed ) {
return curCSS( elem, "margin-right", "marginRight" ); return curCSS( elem, "margin-right" );
} else { } else {
return elem.style.marginRight; return elem.style.marginRight;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment