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

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 834b1163ab5802767af19fb9acf5cd050e70e383..639ed4b642b5602a2d0db47deaf80704bffb7e73 100644 (file)
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -155,3 +155,5 @@ Marcel Greter <marcel.greter@ocbnet.ch>
 Matthias Jäggli <matthias.jaeggli@gmail.com>
 Yiming He <yiminghe@gmail.com>
 Devin Cooper <cooper.semantics@gmail.com>
+Bennett Sorbo <bsorbo@gmail.com>
+ 
\ No newline at end of file

diff --git a/src/css.js b/src/css.js
index 18ca9c831dad37d85c8f7ab84a469d2505b6496b..963822a68fc30e50d6c5782126a28f1a42d92985 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -155,6 +155,7 @@ jQuery.extend({
 
        // Exclude the following css properties to add px
        cssNumber: {
+               "columnCount": true,
                "fillOpacity": true,
                "fontWeight": true,
                "lineHeight": true,

diff --git a/test/unit/css.js b/test/unit/css.js
index e27d5b615aff684610d9e8bfeaf4987cb64ea753..092be7e0954baa156e58eb811bb3bbe6cfad9232 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -823,11 +823,20 @@ if ( jQuery.fn.offset ) {
        });
 }
 
-test("Do not append px to 'fill-opacity' #9548", function() {
-       expect( 1 );
+test("Do not append px (#9548, #12990)", function() {
+       expect( 2 );
+
+       var $div = jQuery("<div>").appendTo("#qunit-fixture");
 
-       var $div = jQuery("<div>").appendTo("#qunit-fixture").css("fill-opacity", 1);
-       equal( $div.css("fill-opacity"), 1, "Do not append px to 'fill-opacity'");
+       $div.css( "fill-opacity", 1 );
+       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() {