CSS: Add animation-iteration-count to cssNumber, fix tests

(cherry-picked from df822caff079177d1840d67e03d6b24a93ea99a5)

Fixes gh-2792
Closes gh-2793

diff --git a/src/css.js b/src/css.js
index 610267d44e192469c4cd480414a36d9024a90a2a..f96600b451553c2feb80e6709be2830d4b12cd71 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -255,6 +255,7 @@ jQuery.extend( {
 
        // Don't automatically add "px" to these possibly-unitless properties
        cssNumber: {
+               "animationIterationCount": true,
                "columnCount": true,
                "fillOpacity": true,
                "flexGrow": true,

diff --git a/test/unit/css.js b/test/unit/css.js
index adfc46cb8a2861619a7432b50bc7de544997bca8..95ba696697692b43f302c3e405c79046b6f99a1a 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -916,26 +916,35 @@ if ( jQuery.fn.offset ) {
        } );
 }
 
-QUnit.test( "Do not append px (#9548, #12990)", function( assert ) {
-       assert.expect( 2 );
+QUnit.test( "Do not append px (#9548, #12990, #2792)", function( assert ) {
+       assert.expect( 3 );
 
        var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" );
 
        $div.css( "fill-opacity", 1 );
 
        // Support: Android 2.3 (no support for fill-opacity)
-       if ( $div.css( "fill-opacity" ) ) {
+       if ( $div.css( "fill-opacity" ) !== undefined ) {
                assert.equal( $div.css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" );
        } else {
                assert.ok( true, "No support for fill-opacity CSS property" );
        }
 
        $div.css( "column-count", 1 );
-       if ( $div.css( "column-count" ) ) {
+       if ( $div.css( "column-count" ) !== undefined ) {
                assert.equal( $div.css( "column-count" ), 1, "Do not append px to 'column-count'" );
        } else {
                assert.ok( true, "No support for column-count CSS property" );
        }
+
+       $div.css( "animation-iteration-count", 2 );
+       if ( $div.css( "animation-iteration-count" ) !== undefined ) {
+               // if $div.css( "animation-iteration-count" ) return "1",
+               // it actually return the default value of animation-iteration-count
+               assert.equal( $div.css( "animation-iteration-count" ), 2, "Do not append px to 'animation-iteration-count'" );
+       } else {
+               assert.ok( true, "No support for animation-iteration-count CSS property" );
+       }
 } );
 
 QUnit.test( "css('width') and css('height') should respect box-sizing, see #11004", function( assert ) {