diff options
author | timmywil <tim.willison@thisismedium.com> | 2011-05-13 12:14:31 -0400 |
---|---|---|
committer | timmywil <tim.willison@thisismedium.com> | 2011-05-13 12:14:31 -0400 |
commit | a5b7c0fa3316616d86bcb584375b02e33b0bac08 (patch) | |
tree | baa7586e7d6e8cec658dda34e79b6b3d6d5e91f2 | |
parent | cbbd7d28e1088e76a9c89bfb30ba9af8f1fce759 (diff) | |
download | jquery-a5b7c0fa3316616d86bcb584375b02e33b0bac08.tar.gz jquery-a5b7c0fa3316616d86bcb584375b02e33b0bac08.zip |
Style edits for pull request 375
-rw-r--r-- | src/css.js | 2 | ||||
-rw-r--r-- | test/unit/css.js | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/css.js b/src/css.js index 59eaed71c..661d800d7 100644 --- a/src/css.js +++ b/src/css.js @@ -97,7 +97,7 @@ jQuery.extend({ if ( type === "string" && rrelNum.test( value ) ) { value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) ); // Fixes bug #9237 - type = 'number'; + type = "number"; } // If a number was passed in, add 'px' to the (except for certain CSS properties) diff --git a/test/unit/css.js b/test/unit/css.js index 67271c876..e631f4962 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -112,10 +112,10 @@ test("css() explicit and relative values", function() { expect(27); var $elem = jQuery("#nothiddendiv"); - $elem.css({ width: 1, height: 1, paddingLeft: '1px', opacity: 1 }); + $elem.css({ width: 1, height: 1, paddingLeft: "1px", opacity: 1 }); equals( $elem.width(), 1, "Initial css set or width/height works (hash)" ); - equals( $elem.css("paddingLeft"), '1px', "Initial css set of paddingLeft works (hash)" ); - equals( $elem.css("opacity"), '1', "Initial css set of opacity works (hash)" ); + equals( $elem.css("paddingLeft"), "1px", "Initial css set of paddingLeft works (hash)" ); + equals( $elem.css("opacity"), "1", "Initial css set of opacity works (hash)" ); $elem.css({ width: "+=9" }); equals( $elem.width(), 10, "'+=9' on width (hash)" ); @@ -142,52 +142,52 @@ test("css() explicit and relative values", function() { equals( $elem.width(), 1, "'-=9px' on width (params)" ); $elem.css({ paddingLeft: "+=4" }); - equals( $elem.css("paddingLeft"), '5px', "'+=4' on paddingLeft (hash)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4' on paddingLeft (hash)" ); $elem.css({ paddingLeft: "-=4" }); - equals( $elem.css("paddingLeft"), '1px', "'-=4' on paddingLeft (hash)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4' on paddingLeft (hash)" ); $elem.css({ paddingLeft: "+=4px" }); - equals( $elem.css("paddingLeft"), '5px', "'+=4px' on paddingLeft (hash)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4px' on paddingLeft (hash)" ); $elem.css({ paddingLeft: "-=4px" }); - equals( $elem.css("paddingLeft"), '1px', "'-=4px' on paddingLeft (hash)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4px' on paddingLeft (hash)" ); $elem.css({ "padding-left": "+=4" }); - equals( $elem.css("paddingLeft"), '5px', "'+=4' on padding-left (hash)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4' on padding-left (hash)" ); $elem.css({ "padding-left": "-=4" }); - equals( $elem.css("paddingLeft"), '1px', "'-=4' on padding-left (hash)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4' on padding-left (hash)" ); $elem.css({ "padding-left": "+=4px" }); - equals( $elem.css("paddingLeft"), '5px', "'+=4px' on padding-left (hash)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4px' on padding-left (hash)" ); $elem.css({ "padding-left": "-=4px" }); - equals( $elem.css("paddingLeft"), '1px', "'-=4px' on padding-left (hash)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4px' on padding-left (hash)" ); $elem.css( "paddingLeft", "+=4" ); - equals( $elem.css("paddingLeft"), '5px', "'+=4' on paddingLeft (params)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4' on paddingLeft (params)" ); $elem.css( "paddingLeft", "-=4" ); - equals( $elem.css("paddingLeft"), '1px', "'-=4' on paddingLeft (params)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4' on paddingLeft (params)" ); $elem.css( "padding-left", "+=4px" ); - equals( $elem.css("paddingLeft"), '5px', "'+=4px' on padding-left (params)" ); + equals( $elem.css("paddingLeft"), "5px", "'+=4px' on padding-left (params)" ); $elem.css( "padding-left", "-=4px" ); - equals( $elem.css("paddingLeft"), '1px', "'-=4px' on padding-left (params)" ); + equals( $elem.css("paddingLeft"), "1px", "'-=4px' on padding-left (params)" ); $elem.css({ opacity: "-=0.5" }); - equals( $elem.css("opacity"), '0.5', "'-=0.5' on opacity (hash)" ); + equals( $elem.css("opacity"), "0.5", "'-=0.5' on opacity (hash)" ); $elem.css({ opacity: "+=0.5" }); - equals( $elem.css("opacity"), '1', "'+=0.5' on opacity (hash)" ); + equals( $elem.css("opacity"), "1", "'+=0.5' on opacity (hash)" ); $elem.css( "opacity", "-=0.5" ); - equals( $elem.css("opacity"), '0.5', "'-=0.5' on opacity (params)" ); + equals( $elem.css("opacity"), "0.5", "'-=0.5' on opacity (params)" ); $elem.css( "opacity", "+=0.5" ); - equals( $elem.css("opacity"), '1', "'+=0.5' on opacity (params)" ); + equals( $elem.css("opacity"), "1", "'+=0.5' on opacity (params)" ); }); test("css(String, Object)", function() { |