Commited306c0

authored

CSS: Don’t trim whitespace of undefined custom property

Fixesgh-5105Closesgh-5106Signed-off-by: Anders Kaseorg <andersk@mit.edu>

1 parentd153c37 commited306c0Copy full SHA for ed306c0

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function curCSS( elem, name, computed ) {`
`15`	`15`	`ret=computed.getPropertyValue(name)\|\|computed[name];`
`16`	`16`
`17`	`17`	`// trim whitespace for custom property (issue gh-4926)`
`18`		`-if(isCustomProp){`
	`18`	`+if(isCustomProp&&ret!==undefined){`
`19`	`19`
`20`	`20`	`// rtrim treats U+000D CARRIAGE RETURN and U+000C FORM FEED`
`21`	`21`	`// as whitespace while CSS does not, but this is not a problem`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1748,6 +1748,7 @@ QUnit.testUnlessIE( "css(--customProperty)", function( assert ) {`
`1748`	`1748`	`" --prop10:\f\r\n\t val10 \f\r\n\t;\n"+`
`1749`	`1749`	`" --prop11:\u000C\u000D\u000A\u0009\u0020val11\u0020\u0009\u000A\u000D\u000C;\n"+`
`1750`	`1750`	`" --prop12:\u000Bval12\u000B;\n"+`
	`1751`	`+" --empty:;\n"+`
`1751`	`1752`	`" }\n"+`
`1752`	`1753`	`"</style>"`
`1753`	`1754`	`);`
`@@ -1756,7 +1757,7 @@ QUnit.testUnlessIE( "css(--customProperty)", function( assert ) {`
`1756`	`1757`	`$elem=jQuery("<div>").addClass("test__customProperties")`
`1757`	`1758`	`.appendTo("#qunit-fixture"),`
`1758`	`1759`	`webkitOrBlink=/\bsafari\b/i.test(navigator.userAgent),`
`1759`		`-expected=17;`
	`1760`	`+expected=19;`
`1760`	`1761`
`1761`	`1762`	`if(webkitOrBlink){`
`1762`	`1763`	`expected-=2;`
`@@ -1802,6 +1803,8 @@ QUnit.testUnlessIE( "css(--customProperty)", function( assert ) {`
`1802`	`1803`	`assert.equal($elem.css("--prop10"),"val10","Multiple preceding and following escaped unicode whitespace trimmed");`
`1803`	`1804`	`assert.equal($elem.css("--prop11"),"val11","Multiple preceding and following unicode whitespace trimmed");`
`1804`	`1805`	`assert.equal($elem.css("--prop12"),"\u000Bval12\u000B","Multiple preceding and following non-CSS whitespace reserved");`
	`1806`	`+assert.equal($elem.css("--empty"),undefined);`
	`1807`	`+assert.equal($elem.css("--nonexistent"),undefined);`
`1805`	`1808`	`});`
`1806`	`1809`
`1807`	`1810`	`// IE doesn't support CSS variables.`

Comments

(0)