Skip to content

Commit

Permalink
CSS: Don't auto-append "px" to CSS variables (#4064)
Browse files Browse the repository at this point in the history
Fixes gh-4063
Closes gh-4064
  • Loading branch information
mgol committed Jun 4, 2018
1 parent 45f0858 commit 75b77b4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ jQuery.extend( {
}

// If a number was passed in, add the unit (except for certain CSS properties)
if ( type === "number" ) {
// The isCustomProp check can be removed in jQuery 4.0 when we only auto-append
// "px" to a few hardcoded values.
if ( type === "number" && !isCustomProp ) {
value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
}

Expand Down
15 changes: 15 additions & 0 deletions test/unit/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,21 @@ QUnit.test( "Do not throw on frame elements from css method (#15098)", function(
assert.equal( $elem.css( "--prop5" ), "'val5'", "Works with single quotes" );
}
} );

QUnit[ supportsCssVars ? "test" : "skip" ]( "Don't append px to CSS vars", function( assert ) {
assert.expect( 3 );

var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" );

$div
.css( "--a", 3 )
.css( "--line-height", 4 )
.css( "--lineHeight", 5 );

assert.equal( $div.css( "--a" ), "3", "--a: 3" );
assert.equal( $div.css( "--line-height" ), "4", "--line-height: 4" );
assert.equal( $div.css( "--lineHeight" ), "5", "--lineHeight: 5" );
} );
} )();

}

0 comments on commit 75b77b4

Please sign in to comment.