Commit 32842ac3 authored by Bennett Sorbo's avatar Bennett Sorbo Committed by Dave Methvin

Fix #12990. Don't add 'px' to column-count. Close gh-1050.

parent 93e18922
...@@ -155,3 +155,5 @@ Marcel Greter <marcel.greter@ocbnet.ch> ...@@ -155,3 +155,5 @@ Marcel Greter <marcel.greter@ocbnet.ch>
Matthias Jäggli <matthias.jaeggli@gmail.com> Matthias Jäggli <matthias.jaeggli@gmail.com>
Yiming He <yiminghe@gmail.com> Yiming He <yiminghe@gmail.com>
Devin Cooper <cooper.semantics@gmail.com> Devin Cooper <cooper.semantics@gmail.com>
Bennett Sorbo <bsorbo@gmail.com>
\ No newline at end of file
...@@ -155,6 +155,7 @@ jQuery.extend({ ...@@ -155,6 +155,7 @@ jQuery.extend({
// Exclude the following css properties to add px // Exclude the following css properties to add px
cssNumber: { cssNumber: {
"columnCount": true,
"fillOpacity": true, "fillOpacity": true,
"fontWeight": true, "fontWeight": true,
"lineHeight": true, "lineHeight": true,
......
...@@ -823,11 +823,20 @@ if ( jQuery.fn.offset ) { ...@@ -823,11 +823,20 @@ if ( jQuery.fn.offset ) {
}); });
} }
test("Do not append px to 'fill-opacity' #9548", function() { test("Do not append px (#9548, #12990)", function() {
expect( 1 ); expect( 2 );
var $div = jQuery("<div>").appendTo("#qunit-fixture");
var $div = jQuery("<div>").appendTo("#qunit-fixture").css("fill-opacity", 1); $div.css( "fill-opacity", 1 );
equal( $div.css("fill-opacity"), 1, "Do not append px to 'fill-opacity'"); equal( $div.css("fill-opacity"), 1, "Do not append px to 'fill-opacity'" );
$div.css( "column-count", 1 );
if ( $div.css("column-count") ) {
equal( $div.css("column-count"), 1, "Do not append px to 'column-count'" );
} else {
ok( true, "No support for column-count CSS property" );
}
}); });
test("css('width') and css('height') should respect box-sizing, see #11004", function() { test("css('width') and css('height') should respect box-sizing, see #11004", function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment