diff options
author | Mike Sherov <mike.sherov@gmail.com> | 2012-05-31 08:32:19 -0400 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2012-06-01 08:24:23 -0700 |
commit | 888635f8c17e857ff98a931451ee54aecddabbca (patch) | |
tree | b8948fc281970d22f955ecae8fdb4908279876e2 | |
parent | 1442bf944949cabf1b6674a657bfdd642a16da33 (diff) | |
download | jquery-888635f8c17e857ff98a931451ee54aecddabbca.tar.gz jquery-888635f8c17e857ff98a931451ee54aecddabbca.zip |
No need to dasherize and use getPropertyValue, closes gh-805.
All invocations of curCSS are already camelcased. See the PR for discussion.
-rw-r--r-- | src/css.js | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/css.js b/src/css.js index a98ad1af6..67559e950 100644 --- a/src/css.js +++ b/src/css.js @@ -6,8 +6,6 @@ jQuery.cssExpand = [ "Top", "Right", "Bottom", "Left" ]; var curCSS, iframe, iframeDoc, ralpha = /alpha\([^)]*\)/i, ropacity = /opacity=([^)]*)/, - // fixed for IE9, see #8346 - rupper = /([A-Z]|^ms)/g, rnumsplit = /^([\-+]?(?:\d*\.)?\d+)(.*)$/i, rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i, rrelNum = /^([\-+])=([\-+.\de]+)/, @@ -229,11 +227,6 @@ jQuery.extend({ // followed by the unprefixed version hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; - // cssFloat needs a special treatment - if ( name === "cssFloat" ) { - name = "float"; - } - // If a hook was provided get the computed value from there if ( hooks && "get" in hooks ) { val = hooks.get( elem, true, extra ); @@ -322,12 +315,10 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { var ret, defaultView, computedStyle, width, style = elem.style; - name = name.replace( rupper, "-$1" ).toLowerCase(); - if ( (defaultView = elem.ownerDocument.defaultView) && (computedStyle = defaultView.getComputedStyle( elem, null )) ) { - ret = computedStyle.getPropertyValue( name ); + ret = computedStyle[ name ]; if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) { ret = jQuery.style( elem, name ); } @@ -553,7 +544,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" ); + return curCSS( elem, "marginRight" ); } else { return elem.style.marginRight; } |