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

Bug 7345; Add support for explicit/relative string values in .css - modified from original pull req by brandonaron #78

Browse source
This commit is contained in:
Dan Heberden 2011-04-04 11:21:15 -07:00
parent 2ed81b44be
commit 123dd72e80
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/css.js
View file

@ -7,6 +7,8 @@ var ralpha = /alpha\([^)]*\)/i,
rupper = /([A-Z]|^ms)/g, rupper = /([A-Z]|^ms)/g,
rnumpx = /^-?\d+(?:px)?$/i, rnumpx = /^-?\d+(?:px)?$/i,
rnum = /^-?\d/, rnum = /^-?\d/,
rrelNum = /=/,
rrelString = /[^+\-\de]+/g,
cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssShow = { position: "absolute", visibility: "hidden", display: "block" },
cssWidth = [ "Left", "Right" ], cssWidth = [ "Left", "Right" ],
@ -75,7 +77,7 @@ jQuery.extend({
} }
// Make sure that we're working with the right name // Make sure that we're working with the right name
var ret, origName = jQuery.camelCase( name ), var ret, parsed, type, origName = jQuery.camelCase( name ),
style = elem.style, hooks = jQuery.cssHooks[ origName ]; style = elem.style, hooks = jQuery.cssHooks[ origName ];
name = jQuery.cssProps[ origName ] || origName; name = jQuery.cssProps[ origName ] || origName;
@ -87,6 +89,12 @@ jQuery.extend({
return; return;
} }
// convert string to number or relative number
if ( type === "string" ) {
parsed = +value.replace( rrelString, '' );
value = rrelNum.test( value ) ? parsed + jQuery.css( elem, name ) : parsed;
}
// 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)
if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) { if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
value += "px"; value += "px";

21
test/unit/css.js
View file

@ -105,6 +105,27 @@ test("css(String|Hash)", function() {
equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on null." ); equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on null." );
}); });
test("css() explicit and relative values", function() {
var $elem = jQuery('#nothiddendiv');
$elem.css({ width: 1, height: 1 });
ok( [$elem.width(), $elem.height()], [1,1] );
$elem.css({ width: "+=9", height: "+=9" });
ok( [$elem.width(), $elem.height()], [10,10] );
$elem.css({ width: "-=9", height: "-=9" });
ok( [$elem.width(), $elem.height()], [1,1] );
$elem.css({ width: "+=9px", height: "+=9px" });
ok( [$elem.width(), $elem.height()], [10,10] );
$elem.css({ width: "-=9px", height: "-=9px" });
ok( [$elem.width(), $elem.height()], [1,1] );
$elem.css("width", "+=9").css("height", "+=9");
ok( [$elem.width(), $elem.height()], [10,10] );
$elem.css("width", "+9").css("height", "+9");
ok( [$elem.width(), $elem.height()], [9,9] );
$elem.css("width", "-9").css("height", "-9");
ok( [$elem.width(), $elem.height()], [0,0] );
});
test("css(String, Object)", function() { test("css(String, Object)", function() {
expect(22); expect(22);