deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Landing pull request 375. Added test case to support #9237 Fixes #9237.

Browse source 
More Details:
 - https://github.com/jquery/jquery/pull/375
 - http://bugs.jquery.com/ticket/9237
This commit is contained in:
avaly 2011-05-13 12:09:49 -04:00 committed by timmywil
parent 3486365062
commit cbbd7d28e1
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/css.js
View file

@ -96,6 +96,8 @@ jQuery.extend({
// convert relative number strings (+= or -=) to relative numbers. #7345 // convert relative number strings (+= or -=) to relative numbers. #7345
if ( type === "string" && rrelNum.test( value ) ) { if ( type === "string" && rrelNum.test( value ) ) {
value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) ); value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) );
// Fixes bug #9237
type = 'number';
} }
// If a number was passed in, add 'px' to the (except for certain CSS properties) // If a number was passed in, add 'px' to the (except for certain CSS properties)

54
test/unit/css.js
View file

@ -109,11 +109,13 @@ test("css(String|Hash)", function() {
}); });
test("css() explicit and relative values", function() { test("css() explicit and relative values", function() {
expect(9); expect(27);
var $elem = jQuery("#nothiddendiv"); var $elem = jQuery("#nothiddendiv");
$elem.css({ width: 1, height: 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.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)" );
$elem.css({ width: "+=9" }); $elem.css({ width: "+=9" });
equals( $elem.width(), 10, "'+=9' on width (hash)" ); equals( $elem.width(), 10, "'+=9' on width (hash)" );
@ -138,6 +140,54 @@ test("css() explicit and relative values", function() {
$elem.css( "width", "-=9px" ); $elem.css( "width", "-=9px" );
equals( $elem.width(), 1, "'-=9px' on width (params)" ); equals( $elem.width(), 1, "'-=9px' on width (params)" );
$elem.css({ paddingLeft: "+=4" });
equals( $elem.css("paddingLeft"), '5px', "'+=4' on paddingLeft (hash)" );
$elem.css({ paddingLeft: "-=4" });
equals( $elem.css("paddingLeft"), '1px', "'-=4' on paddingLeft (hash)" );
$elem.css({ paddingLeft: "+=4px" });
equals( $elem.css("paddingLeft"), '5px', "'+=4px' on paddingLeft (hash)" );
$elem.css({ paddingLeft: "-=4px" });
equals( $elem.css("paddingLeft"), '1px', "'-=4px' on paddingLeft (hash)" );
$elem.css({ "padding-left": "+=4" });
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)" );
$elem.css({ "padding-left": "+=4px" });
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)" );
$elem.css( "paddingLeft", "+=4" );
equals( $elem.css("paddingLeft"), '5px', "'+=4' on paddingLeft (params)" );
$elem.css( "paddingLeft", "-=4" );
equals( $elem.css("paddingLeft"), '1px', "'-=4' on paddingLeft (params)" );
$elem.css( "padding-left", "+=4px" );
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)" );
$elem.css({ opacity: "-=0.5" });
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)" );
$elem.css( "opacity", "-=0.5" );
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)" );
}); });
test("css(String, Object)", function() { test("css(String, Object)", function() {