Skip to content

Fix transitionend event to match spec #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccummings merged 1 commit into from
Apr 5, 2016
Merged

Fix transitionend event to match spec #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions dom/animate/animate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,15 @@ steal('jquery', function ($) {
el = document.createElement('fakeelement'),
transitions = {
'transition': {
transitionEnd : 'transitionEnd',
transitionEnd : 'transitionend',
prefix : ''
},
// 'MSTransition': {
// transitionEnd : 'msTransitionEnd',
// prefix : '-ms-'
// },
'MozTransition': {
transitionEnd : 'animationend',
prefix : '-moz-'
},
'WebkitTransition': {
transitionEnd : 'webkitAnimationEnd',
transitionEnd : 'webkitTransitionEnd',
prefix : '-webkit-'
},
'OTransition': {
Expand Down
26 changes: 14 additions & 12 deletions dom/animate/animate_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,14 +1178,14 @@ steal('jquery',
expect(11);
stop();

var _default_count = 0,
var _def_count = 0,
_special_count = 0,
propsBasic = { "padding": "10 20 30" },
propsSpecial = { "padding": [ "1 2 3", "_special" ] };

$.easing._default = function(p) {
$.easing._def = function(p) {
if ( p >= 1 ) {
_default_count++;
_def_count++;
}
return p;
};
Expand All @@ -1198,24 +1198,24 @@ steal('jquery',
};

jQuery("#foo")
.animate( propsBasic, 200, "_default", function() {
.animate( propsBasic, 200, "_def", function() {
equal( this.style.paddingTop, "10px", "padding-top was animated" );
equal( this.style.paddingLeft, "20px", "padding-left was animated" );
equal( this.style.paddingRight, "20px", "padding-right was animated" );
equal( this.style.paddingBottom, "30px", "padding-bottom was animated" );
equal( _default_count, 4, "per-animation default easing called for each property" );
_default_count = 0;
equal( _def_count, 4, "per-animation default easing called for each property" );
_def_count = 0;
})
.animate( propsSpecial, 200, "_default", function() {
.animate( propsSpecial, 200, "_def", function() {
equal( this.style.paddingTop, "1px", "padding-top was animated again" );
equal( this.style.paddingLeft, "2px", "padding-left was animated again" );
equal( this.style.paddingRight, "2px", "padding-right was animated again" );
equal( this.style.paddingBottom, "3px", "padding-bottom was animated again" );
equal( _default_count, 0, "per-animation default easing not called" );
equal( _def_count, 0, "per-animation default easing not called" );
equal( _special_count, 4, "special easing called for each property" );

jQuery(this).css("padding", "0");
delete $.easing._default;
delete $.easing._def;
delete $.easing._special;
start();
});
Expand Down Expand Up @@ -1693,7 +1693,7 @@ steal('jquery',
});
});*/

asyncTest("Animation callbacks (#11797)", 15, function() {
asyncTest("Animation callbacks (#11797)", 16, function() {
var targets = jQuery("#foo").children(),
done = false,
expectedProgress = 0;
Expand All @@ -1704,7 +1704,8 @@ steal('jquery',
ok( true, "empty: start" );
},
progress: function( anim, percent ) {
equal( percent, 0, "empty: progress 0" );
equal( percent, expectedProgress, "empty: progress " + expectedProgress );
expectedProgress++;
},
done: function() {
ok( true, "empty: done" );
Expand Down Expand Up @@ -1744,7 +1745,8 @@ steal('jquery',
}).stop();

ok( done, "stopped: stopped immediately" );


expectedProgress = 0;
targets.eq( 2 ).animate({
opacity: 0
}, {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"steal-tools": "^0.8.2",
"syn": "0.1.X",
"system-text": "0.1.0",
"testee": "^0.1.8"
"testee": "^0.2.5"
},
"main": "./index",
"system": {
Expand Down