library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes gh-2792
Closes gh-2793
This commit is contained in:
Jun Sun 2015-12-30 15:40:08 +08:00 committed by Michał Gołębiowski
parent a4d16a26ab
commit df822caff0
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/css.js
View File

@ -190,6 +190,7 @@ jQuery.extend( {
// Don't automatically add "px" to these possibly-unitless properties // Don't automatically add "px" to these possibly-unitless properties
cssNumber: { cssNumber: {
"animationIterationCount": true,
"columnCount": true, "columnCount": true,
"fillOpacity": true, "fillOpacity": true,
"flexGrow": true, "flexGrow": true,

17
test/unit/css.js
View File

@ -840,26 +840,35 @@ if ( jQuery.fn.offset ) {
} ); } );
} }
QUnit.test( "Do not append px (#9548, #12990)", function( assert ) { QUnit.test( "Do not append px (#9548, #12990, #2792)", function( assert ) {
assert.expect( 2 ); assert.expect( 3 );
var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" ); var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" );
$div.css( "fill-opacity", 1 ); $div.css( "fill-opacity", 1 );
// Support: Android 2.3 (no support for fill-opacity) // 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'" ); assert.equal( $div.css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" );
} else { } else {
assert.ok( true, "No support for fill-opacity CSS property" ); assert.ok( true, "No support for fill-opacity CSS property" );
} }
$div.css( "column-count", 1 ); $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'" ); assert.equal( $div.css( "column-count" ), 1, "Do not append px to 'column-count'" );
} else { } else {
assert.ok( true, "No support for column-count CSS property" ); 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 ) { QUnit.test( "css('width') and css('height') should respect box-sizing, see #11004", function( assert ) {