Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(ngAnimate): close follow-up class-based animations when the same class is added/removed when removed/added #11755

Closed
wants to merge 1 commit into from
Closed

fix(ngAnimate): close follow-up class-based animations when the same class is added/removed when removed/added #11755

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: 8 additions & 0 deletions src/ngAnimate/animateQueue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
return currentAnimation.state === RUNNING_STATE && newAnimation.structural;
});

rules.cancel.push(function(element, newAnimation, currentAnimation) {
var nO = newAnimation.options;
var cO = currentAnimation.options;

// if the exact same CSS class is added/removed then it's safe to cancel it
return (nO.addClass && nO.addClass === cO.removeClass) || (nO.removeClass && nO.removeClass === cO.addClass);
});

this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap',
'$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite',
function($$rAF, $rootScope, $rootElement, $document, $$HashMap,
Expand Down
45 changes: 45 additions & 0 deletions test/ngAnimate/animateSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,51 @@ describe("animations", function() {
expect(enterComplete).toBe(true);
}));

it('should cancel the previously running removeClass animation if a follow-up addClass animation is using the same class value',
inject(function($animate, $rootScope, $$rAF) {

parent.append(element);
var runner = $animate.addClass(element, 'active-class');
$rootScope.$digest();

var closed = false;
runner.done(function(status) {
closed = true;
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why you are not using spies for this kind of thing? I find it much more readable:

var doneHandler = jasmine.createSpy('addClass done');
runner.done(doneHandler);

$$rAF.flush();

expect(doneHandler).not.toHaveBeenCalled();

$animate.removeClass(element, 'active-class');
$rootScope.$digest();

expect(doneHandler).toHaveBeenCalled();


$$rAF.flush();

expect(closed).toBe(false);

$animate.removeClass(element, 'active-class');
$rootScope.$digest();

expect(closed).toBe(true);
}));

it('should cancel the previously running addClass animation if a follow-up removeClass animation is using the same class value',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aren't descriptions of those 2 tests swapped?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right @mzgol.

inject(function($animate, $rootScope, $$rAF) {

element.addClass('active-class');
parent.append(element);
var runner = $animate.removeClass(element, 'active-class');
$rootScope.$digest();

var closed = false;
runner.done(function(status) {
closed = true;
});

$$rAF.flush();

expect(closed).toBe(false);

$animate.addClass(element, 'active-class');
$rootScope.$digest();

expect(closed).toBe(true);
}));

it('should skip the class-based animation entirely if there is an active structural animation',
inject(function($animate, $rootScope) {

Expand Down