Permalink
Browse files

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

Fixes gh-2792
Closes gh-2793
  • Loading branch information...
1 parent a4d16a2 commit df822caff079177d1840d67e03d6b24a93ea99a5 @ufologist ufologist committed with mgol Dec 30, 2015
Showing with 14 additions and 4 deletions.
  1. +1 −0 src/css.js
  2. +13 −4 test/unit/css.js
View
@@ -190,6 +190,7 @@ jQuery.extend( {
// Don't automatically add "px" to these possibly-unitless properties
cssNumber: {
+ "animationIterationCount": true,
"columnCount": true,
"fillOpacity": true,
"flexGrow": true,
View
@@ -840,26 +840,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 ) {

0 comments on commit df822ca

Please sign in to comment.