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

Commit d50ed6b

Browse files
matskopetebacondarwin
matsko
authored and
petebacondarwin
committed
fix(ngAnimate): check elapsedTime on current event
onAnimationProgress now checks the event's elapsedTime property before checking the originalEvent.elapsedTime property. Use browserTrigger with elapsedTime parameter to trigger animation events
1 parent 28f56a3 commit d50ed6b

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎src/ngAnimate/animate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ angular.module('ngAnimate', ['ng'])
659659
}
660660

661661
function onAnimationProgress(event) {
662-
event.originalEvent.elapsedTime >= totalTime && done();
662+
(event.elapsedTime || (event.originalEvent && event.originalEvent.elapsedTime)) >= totalTime && done();
663663
}
664664

665665
function parseMaxTime(str) {

‎test/ngAnimate/animateSpec.js

+39-39
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ describe("ngAnimate", function() {
138138
if($sniffer.transitions) {
139139
expect(child.hasClass('ng-enter')).toBe(true);
140140
expect(child.hasClass('ng-enter-active')).toBe(true);
141-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
141+
browserTrigger(element, 'transitionend', { elapsedTime: 1 });
142142
}
143143

144144
expect(element.contents().length).toBe(1);
@@ -154,7 +154,7 @@ describe("ngAnimate", function() {
154154
if($sniffer.transitions) {
155155
expect(child.hasClass('ng-leave')).toBe(true);
156156
expect(child.hasClass('ng-leave-active')).toBe(true);
157-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
157+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
158158
}
159159

160160
expect(element.contents().length).toBe(0);
@@ -186,7 +186,7 @@ describe("ngAnimate", function() {
186186
if($sniffer.transitions) {
187187
expect(child.hasClass('ng-hide-remove')).toBe(true);
188188
expect(child.hasClass('ng-hide-remove-active')).toBe(true);
189-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
189+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
190190
}
191191
expect(child.hasClass('ng-hide-remove')).toBe(false);
192192
expect(child.hasClass('ng-hide-remove-active')).toBe(false);
@@ -202,7 +202,7 @@ describe("ngAnimate", function() {
202202
if($sniffer.transitions) {
203203
expect(child.hasClass('ng-hide-add')).toBe(true);
204204
expect(child.hasClass('ng-hide-add-active')).toBe(true);
205-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
205+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
206206
}
207207
expect(child).toBeHidden();
208208
}));
@@ -221,7 +221,7 @@ describe("ngAnimate", function() {
221221

222222
expect(child.attr('class')).toContain('ng-enter');
223223
expect(child.attr('class')).toContain('ng-enter-active');
224-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
224+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
225225

226226
//move
227227
element.append(after);
@@ -230,26 +230,26 @@ describe("ngAnimate", function() {
230230

231231
expect(child.attr('class')).toContain('ng-move');
232232
expect(child.attr('class')).toContain('ng-move-active');
233-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
233+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
234234

235235
//hide
236236
$animate.addClass(child, 'ng-hide');
237237
expect(child.attr('class')).toContain('ng-hide-add');
238238
expect(child.attr('class')).toContain('ng-hide-add-active');
239-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
239+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
240240

241241
//show
242242
$animate.removeClass(child, 'ng-hide');
243243
expect(child.attr('class')).toContain('ng-hide-remove');
244244
expect(child.attr('class')).toContain('ng-hide-remove-active');
245-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
245+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
246246

247247
//leave
248248
$animate.leave(child);
249249
$rootScope.$digest();
250250
expect(child.attr('class')).toContain('ng-leave');
251251
expect(child.attr('class')).toContain('ng-leave-active');
252-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
252+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
253253
}));
254254

255255
it("should not run if animations are disabled",
@@ -292,7 +292,7 @@ describe("ngAnimate", function() {
292292

293293
if($sniffer.transitions) {
294294
expect(element.children().length).toBe(1); //still animating
295-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
295+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
296296
}
297297
$timeout.flush(2000);
298298
$timeout.flush(2000);
@@ -309,7 +309,7 @@ describe("ngAnimate", function() {
309309
child.addClass('custom-delay ng-hide');
310310
$animate.removeClass(child, 'ng-hide');
311311
if($sniffer.transitions) {
312-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
312+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
313313
}
314314
$timeout.flush(2000);
315315

@@ -373,7 +373,7 @@ describe("ngAnimate", function() {
373373
$animate.removeClass(element, 'ng-hide');
374374

375375
if($sniffer.transitions) {
376-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
376+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
377377
}
378378
$timeout.flush(2000);
379379
$timeout.flush(20000);
@@ -416,7 +416,7 @@ describe("ngAnimate", function() {
416416

417417
$animate.removeClass(element, 'ng-hide');
418418
if ($sniffer.animations) {
419-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 4 } });
419+
browserTrigger(element,'animationend', { elapsedTime: 4 });
420420
}
421421
expect(element).toBeShown();
422422
}));
@@ -439,7 +439,7 @@ describe("ngAnimate", function() {
439439

440440
$animate.removeClass(element, 'ng-hide');
441441
if ($sniffer.animations) {
442-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 6 } });
442+
browserTrigger(element,'animationend', { elapsedTime: 6 });
443443
}
444444
expect(element).toBeShown();
445445
}));
@@ -462,7 +462,7 @@ describe("ngAnimate", function() {
462462

463463
$animate.removeClass(element, 'ng-hide');
464464
if ($sniffer.animations) {
465-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 2 } });
465+
browserTrigger(element,'animationend', { elapsedTime: 2 });
466466
}
467467
expect(element).toBeShown();
468468
}));
@@ -487,7 +487,7 @@ describe("ngAnimate", function() {
487487

488488
$animate.removeClass(element, 'ng-hide');
489489
if ($sniffer.transitions) {
490-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 10 } });
490+
browserTrigger(element,'animationend', { elapsedTime: 10 });
491491
}
492492
expect(element).toBeShown();
493493
}));
@@ -533,7 +533,7 @@ describe("ngAnimate", function() {
533533
if($sniffer.animations) { //cleanup some pending animations
534534
expect(element.hasClass('ng-hide-add')).toBe(true);
535535
expect(element.hasClass('ng-hide-add-active')).toBe(true);
536-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 2 } });
536+
browserTrigger(element,'animationend', { elapsedTime: 2 });
537537
}
538538

539539
expect(element.hasClass('ng-hide-remove-active')).toBe(false);
@@ -566,7 +566,7 @@ describe("ngAnimate", function() {
566566

567567
$animate.removeClass(element, 'ng-hide');
568568
if ($sniffer.transitions) {
569-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
569+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
570570
}
571571
expect(element).toBeShown();
572572
}));
@@ -587,9 +587,9 @@ describe("ngAnimate", function() {
587587
$animate.removeClass(element, 'ng-hide');
588588
if ($sniffer.transitions) {
589589
expect(element).toBeHidden();
590-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
591-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
592-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 2 } });
590+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
591+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
592+
browserTrigger(element,'transitionend', { elapsedTime: 2 });
593593
}
594594
expect(element).toBeShown();
595595
}));
@@ -620,9 +620,9 @@ describe("ngAnimate", function() {
620620

621621
$animate.removeClass(element, 'ng-hide');
622622
if ($sniffer.transitions) {
623-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 0 } });
624-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
625-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
623+
browserTrigger(element,'transitionend', { elapsedTime: 0 });
624+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
625+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
626626
}
627627
expect(element).toBeShown();
628628
}));
@@ -644,7 +644,7 @@ describe("ngAnimate", function() {
644644

645645
$animate.removeClass(element, 'ng-hide');
646646
if ($sniffer.transitions) {
647-
element.triggerHandler('animationend', { originalEvent: { elapsedTime: 10 } });
647+
browserTrigger(element,'animationend', { elapsedTime: 10 });
648648
}
649649
expect(element).toBeShown();
650650
}));
@@ -664,7 +664,7 @@ describe("ngAnimate", function() {
664664
if($sniffer.transitions) {
665665
expect(element.hasClass('ng-hide-remove')).toBe(true);
666666
expect(element.hasClass('ng-hide-remove-active')).toBe(true);
667-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
667+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
668668
}
669669
expect(element.hasClass('ng-hide-remove')).toBe(false);
670670
expect(element.hasClass('ng-hide-remove-active')).toBe(false);
@@ -700,7 +700,7 @@ describe("ngAnimate", function() {
700700
if ($sniffer.transitions) {
701701
expect(element.hasClass('abc ng-enter')).toBe(true);
702702
expect(element.hasClass('abc ng-enter ng-enter-active')).toBe(true);
703-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 22 } });
703+
browserTrigger(element,'transitionend', { elapsedTime: 22 });
704704
}
705705
expect(element.hasClass('abc')).toBe(true);
706706

@@ -711,7 +711,7 @@ describe("ngAnimate", function() {
711711
if ($sniffer.transitions) {
712712
expect(element.hasClass('xyz')).toBe(true);
713713
expect(element.hasClass('xyz ng-enter ng-enter-active')).toBe(true);
714-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 11 } });
714+
browserTrigger(element,'transitionend', { elapsedTime: 11 });
715715
}
716716
expect(element.hasClass('xyz')).toBe(true);
717717
}));
@@ -738,7 +738,7 @@ describe("ngAnimate", function() {
738738
expect(element.hasClass('one two ng-enter ng-enter-active')).toBe(true);
739739
expect(element.hasClass('one-active')).toBe(false);
740740
expect(element.hasClass('two-active')).toBe(false);
741-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 3 } });
741+
browserTrigger(element,'transitionend', { elapsedTime: 3 });
742742
}
743743

744744
expect(element.hasClass('one two')).toBe(true);
@@ -887,7 +887,7 @@ describe("ngAnimate", function() {
887887
});
888888

889889
if($sniffer.transitions) {
890-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
890+
browserTrigger(element,'transitionend', { elapsedTime: 1 });
891891
}
892892
$timeout.flush();
893893
expect(flag).toBe(true);
@@ -1025,7 +1025,7 @@ describe("ngAnimate", function() {
10251025
expect(element.hasClass('klass')).toBe(false);
10261026
expect(element.hasClass('klass-add')).toBe(true);
10271027
expect(element.hasClass('klass-add-active')).toBe(true);
1028-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 3 } });
1028+
browserTrigger(element,'transitionend', { elapsedTime: 3 });
10291029
}
10301030

10311031
//this cancels out the older animation
@@ -1039,7 +1039,7 @@ describe("ngAnimate", function() {
10391039
expect(element.hasClass('klass-add-active')).toBe(false);
10401040

10411041
expect(element.hasClass('klass-remove')).toBe(true);
1042-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 3 } });
1042+
browserTrigger(element,'transitionend', { elapsedTime: 3 });
10431043
}
10441044
$timeout.flush();
10451045

@@ -1097,7 +1097,7 @@ describe("ngAnimate", function() {
10971097
if($sniffer.transitions) {
10981098
expect(element.hasClass('klass-add')).toBe(true);
10991099
expect(element.hasClass('klass-add-active')).toBe(true);
1100-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 11 } });
1100+
browserTrigger(element,'transitionend', { elapsedTime: 11 });
11011101
expect(element.hasClass('klass-add')).toBe(false);
11021102
expect(element.hasClass('klass-add-active')).toBe(false);
11031103
}
@@ -1111,7 +1111,7 @@ describe("ngAnimate", function() {
11111111
if($sniffer.transitions) {
11121112
expect(element.hasClass('klass-remove')).toBe(true);
11131113
expect(element.hasClass('klass-remove-active')).toBe(true);
1114-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 11 } });
1114+
browserTrigger(element,'transitionend', { elapsedTime: 11 });
11151115
expect(element.hasClass('klass-remove')).toBe(false);
11161116
expect(element.hasClass('klass-remove-active')).toBe(false);
11171117
}
@@ -1146,7 +1146,7 @@ describe("ngAnimate", function() {
11461146

11471147
expect(element.hasClass('one-add-active')).toBe(true);
11481148
expect(element.hasClass('two-add-active')).toBe(true);
1149-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 7 } });
1149+
browserTrigger(element,'transitionend', { elapsedTime: 7 });
11501150

11511151
expect(element.hasClass('one-add')).toBe(false);
11521152
expect(element.hasClass('one-add-active')).toBe(false);
@@ -1190,7 +1190,7 @@ describe("ngAnimate", function() {
11901190

11911191
expect(element.hasClass('one-remove-active')).toBe(true);
11921192
expect(element.hasClass('two-remove-active')).toBe(true);
1193-
element.triggerHandler('transitionend', { originalEvent: { elapsedTime: 9 } });
1193+
browserTrigger(element,'transitionend', { elapsedTime: 9 });
11941194

11951195
expect(element.hasClass('one-remove')).toBe(false);
11961196
expect(element.hasClass('one-remove-active')).toBe(false);
@@ -1240,7 +1240,7 @@ describe("ngAnimate", function() {
12401240
if($sniffer.transitions) {
12411241
expect(child.hasClass('ng-enter')).toBe(true);
12421242
expect(child.hasClass('ng-enter-active')).toBe(true);
1243-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
1243+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
12441244
}
12451245

12461246
expect(child.hasClass('ng-enter')).toBe(false);
@@ -1262,7 +1262,7 @@ describe("ngAnimate", function() {
12621262
if($sniffer.transitions) {
12631263
expect(child.hasClass('ng-enter')).toBe(true);
12641264
expect(child.hasClass('ng-enter-active')).toBe(true);
1265-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 8 } });
1265+
browserTrigger(child,'transitionend', { elapsedTime: 8 });
12661266
}
12671267
expect(child.hasClass('ng-enter')).toBe(false);
12681268
expect(child.hasClass('ng-enter-active')).toBe(false);
@@ -1314,7 +1314,7 @@ describe("ngAnimate", function() {
13141314
$timeout.flush(10);
13151315

13161316
if($sniffer.transitions) {
1317-
child.triggerHandler('transitionend', { originalEvent: { elapsedTime: 1 } });
1317+
browserTrigger(child,'transitionend', { elapsedTime: 1 });
13181318
}
13191319

13201320
expect(child.hasClass('i-was-animated')).toBe(true);

0 commit comments

Comments
 (0)