]> source.dussan.org Git - jquery.git/commitdiff
No need to dasherize and use getPropertyValue, closes gh-805.
authorMike Sherov <mike.sherov@gmail.com>
Thu, 31 May 2012 12:32:19 +0000 (08:32 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Fri, 1 Jun 2012 15:24:23 +0000 (08:24 -0700)
All invocations of curCSS are already camelcased. See the PR for discussion.

src/css.js

index a98ad1af6652415506a1c6b31d514d2197b637ee..67559e950009166a7a42f1996fbd433324c06217 100644 (file)
@@ -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;
                                        }