Skip to content

Commit 96b1e65

Browse files
EisenbergEffectEisenbergEffect
committed
chore(all): prepare release 1.0.3
1 parent 74904c4 commit 96b1e65

File tree

9 files changed

+134
-25
lines changed

9 files changed

+134
-25
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-animator-css",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "An implementation of the abstract Animator interface from templating which enables css-based animations.",
55
"keywords": [
66
"aurelia",

‎dist/amd/aurelia-animator-css.js‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
190190
var _animStart = void 0;
191191
var animHasStarted = false;
192192
_this4._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart = function animStart(evAnimStart) {
193+
if (evAnimStart.target !== element) {
194+
return;
195+
}
193196
animHasStarted = true;
194197
_this4.isAnimating = true;
195198

@@ -205,6 +208,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
205208
if (!animHasStarted) {
206209
return;
207210
}
211+
if (evAnimEnd.target !== element) {
212+
return;
213+
}
208214

209215
evAnimEnd.stopPropagation();
210216

@@ -224,7 +230,6 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
224230
}, false);
225231

226232
var parent = element.parentElement;
227-
var delay = 0;
228233
var attrib = 'data-animator-pending' + direction;
229234

230235
var cleanupAnimation = function cleanupAnimation() {
@@ -242,10 +247,10 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
242247
parent && parent.setAttribute(attrib, +(parent.getAttribute(attrib) || 1) - 1);
243248
};
244249

245-
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-enter'))) {
250+
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-' + direction))) {
246251
var offset = +(parent.getAttribute(attrib) || 0);
247252
parent.setAttribute(attrib, offset + 1);
248-
delay = _this4._getElementAnimationDelay(parent) * offset;
253+
var delay = _this4._getElementAnimationDelay(parent) * offset;
249254
_this4._triggerDOMEvent(_aureliaTemplating.animationEvent.staggerNext, element);
250255

251256
setTimeout(function () {
@@ -290,6 +295,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
290295
var _animStart2 = void 0;
291296
var animHasStarted = false;
292297
_this5._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart2 = function animStart(evAnimStart) {
298+
if (evAnimStart.target !== element) {
299+
return;
300+
}
293301
animHasStarted = true;
294302
_this5.isAnimating = true;
295303

@@ -307,6 +315,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
307315
if (!animHasStarted) {
308316
return;
309317
}
318+
if (evAnimEnd.target !== element) {
319+
return;
320+
}
310321

311322
evAnimEnd.stopPropagation();
312323

@@ -357,6 +368,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
357368
var _animStart3 = void 0;
358369
var animHasStarted = false;
359370
_this6._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart3 = function animStart(evAnimStart) {
371+
if (evAnimStart.target !== element) {
372+
return;
373+
}
360374
animHasStarted = true;
361375
_this6.isAnimating = true;
362376

@@ -374,6 +388,9 @@ define(['exports', 'aurelia-templating', 'aurelia-pal'], function (exports, _aur
374388
if (!animHasStarted) {
375389
return;
376390
}
391+
if (evAnimEnd.target !== element) {
392+
return;
393+
}
377394

378395
evAnimEnd.stopPropagation();
379396

‎dist/aurelia-animator-css.js‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@ export class CssAnimator {
258258
let animStart;
259259
let animHasStarted = false;
260260
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = (evAnimStart) => {
261+
if (evAnimStart.target !== element) {
262+
return;
263+
}
261264
animHasStarted = true;
262265
this.isAnimating = true;
263266

@@ -275,6 +278,9 @@ export class CssAnimator {
275278
if (!animHasStarted) {
276279
return;
277280
}
281+
if (evAnimEnd.target !== element) {
282+
return;
283+
}
278284

279285
// Step 3.1.0: Stop event propagation, bubbling will otherwise prevent parent animation
280286
evAnimEnd.stopPropagation();
@@ -301,7 +307,6 @@ export class CssAnimator {
301307

302308
// Step 4: check if parent element is defined to stagger animations otherwise trigger active immediately
303309
const parent = element.parentElement;
304-
let delay = 0;
305310
const attrib = 'data-animator-pending' + direction;
306311

307312
const cleanupAnimation = () => {
@@ -320,15 +325,11 @@ export class CssAnimator {
320325
parent && parent.setAttribute(attrib, +(parent.getAttribute(attrib) || 1) - 1);
321326
};
322327

323-
if (parent !== null &&
324-
parent !== undefined &&
325-
(
326-
parent.classList.contains('au-stagger') ||
327-
parent.classList.contains('au-stagger-enter')
328-
)) {
328+
if (parent !== null && parent !== undefined &&
329+
(parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-' + direction))) {
329330
const offset = +(parent.getAttribute(attrib) || 0);
330331
parent.setAttribute(attrib, offset + 1);
331-
delay = this._getElementAnimationDelay(parent) * offset;
332+
const delay = this._getElementAnimationDelay(parent) * offset;
332333
this._triggerDOMEvent(animationEvent.staggerNext, element);
333334

334335
setTimeout(() => {
@@ -388,6 +389,9 @@ export class CssAnimator {
388389
let animStart;
389390
let animHasStarted = false;
390391
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = (evAnimStart) => {
392+
if (evAnimStart.target !== element) {
393+
return;
394+
}
391395
animHasStarted = true;
392396
this.isAnimating = true;
393397

@@ -407,6 +411,9 @@ export class CssAnimator {
407411
if (! animHasStarted) {
408412
return;
409413
}
414+
if (evAnimEnd.target !== element) {
415+
return;
416+
}
410417

411418
// Step 3.1.0: Stop event propagation, bubbling will otherwise prevent parent animation
412419
evAnimEnd.stopPropagation();
@@ -467,6 +474,9 @@ export class CssAnimator {
467474
let animStart;
468475
let animHasStarted = false;
469476
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = (evAnimStart) => {
477+
if (evAnimStart.target !== element) {
478+
return;
479+
}
470480
animHasStarted = true;
471481
this.isAnimating = true;
472482

@@ -486,6 +496,9 @@ export class CssAnimator {
486496
if (! animHasStarted) {
487497
return;
488498
}
499+
if (evAnimEnd.target !== element) {
500+
return;
501+
}
489502

490503
// Step 2.1.0: Stop event propagation, bubbling will otherwise prevent parent animation
491504
evAnimEnd.stopPropagation();

‎dist/commonjs/aurelia-animator-css.js‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ var CssAnimator = exports.CssAnimator = function () {
193193
var _animStart = void 0;
194194
var animHasStarted = false;
195195
_this4._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart = function animStart(evAnimStart) {
196+
if (evAnimStart.target !== element) {
197+
return;
198+
}
196199
animHasStarted = true;
197200
_this4.isAnimating = true;
198201

@@ -208,6 +211,9 @@ var CssAnimator = exports.CssAnimator = function () {
208211
if (!animHasStarted) {
209212
return;
210213
}
214+
if (evAnimEnd.target !== element) {
215+
return;
216+
}
211217

212218
evAnimEnd.stopPropagation();
213219

@@ -227,7 +233,6 @@ var CssAnimator = exports.CssAnimator = function () {
227233
}, false);
228234

229235
var parent = element.parentElement;
230-
var delay = 0;
231236
var attrib = 'data-animator-pending' + direction;
232237

233238
var cleanupAnimation = function cleanupAnimation() {
@@ -245,10 +250,10 @@ var CssAnimator = exports.CssAnimator = function () {
245250
parent && parent.setAttribute(attrib, +(parent.getAttribute(attrib) || 1) - 1);
246251
};
247252

248-
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-enter'))) {
253+
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-' + direction))) {
249254
var offset = +(parent.getAttribute(attrib) || 0);
250255
parent.setAttribute(attrib, offset + 1);
251-
delay = _this4._getElementAnimationDelay(parent) * offset;
256+
var delay = _this4._getElementAnimationDelay(parent) * offset;
252257
_this4._triggerDOMEvent(_aureliaTemplating.animationEvent.staggerNext, element);
253258

254259
setTimeout(function () {
@@ -293,6 +298,9 @@ var CssAnimator = exports.CssAnimator = function () {
293298
var _animStart2 = void 0;
294299
var animHasStarted = false;
295300
_this5._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart2 = function animStart(evAnimStart) {
301+
if (evAnimStart.target !== element) {
302+
return;
303+
}
296304
animHasStarted = true;
297305
_this5.isAnimating = true;
298306

@@ -310,6 +318,9 @@ var CssAnimator = exports.CssAnimator = function () {
310318
if (!animHasStarted) {
311319
return;
312320
}
321+
if (evAnimEnd.target !== element) {
322+
return;
323+
}
313324

314325
evAnimEnd.stopPropagation();
315326

@@ -360,6 +371,9 @@ var CssAnimator = exports.CssAnimator = function () {
360371
var _animStart3 = void 0;
361372
var animHasStarted = false;
362373
_this6._addMultipleEventListener(element, 'webkitAnimationStart animationstart', _animStart3 = function animStart(evAnimStart) {
374+
if (evAnimStart.target !== element) {
375+
return;
376+
}
363377
animHasStarted = true;
364378
_this6.isAnimating = true;
365379

@@ -377,6 +391,9 @@ var CssAnimator = exports.CssAnimator = function () {
377391
if (!animHasStarted) {
378392
return;
379393
}
394+
if (evAnimEnd.target !== element) {
395+
return;
396+
}
380397

381398
evAnimEnd.stopPropagation();
382399

‎dist/es2015/aurelia-animator-css.js‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ export let CssAnimator = class CssAnimator {
170170
let animStart;
171171
let animHasStarted = false;
172172
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = evAnimStart => {
173+
if (evAnimStart.target !== element) {
174+
return;
175+
}
173176
animHasStarted = true;
174177
this.isAnimating = true;
175178

@@ -185,6 +188,9 @@ export let CssAnimator = class CssAnimator {
185188
if (!animHasStarted) {
186189
return;
187190
}
191+
if (evAnimEnd.target !== element) {
192+
return;
193+
}
188194

189195
evAnimEnd.stopPropagation();
190196

@@ -204,7 +210,6 @@ export let CssAnimator = class CssAnimator {
204210
}, false);
205211

206212
const parent = element.parentElement;
207-
let delay = 0;
208213
const attrib = 'data-animator-pending' + direction;
209214

210215
const cleanupAnimation = () => {
@@ -222,10 +227,10 @@ export let CssAnimator = class CssAnimator {
222227
parent && parent.setAttribute(attrib, +(parent.getAttribute(attrib) || 1) - 1);
223228
};
224229

225-
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-enter'))) {
230+
if (parent !== null && parent !== undefined && (parent.classList.contains('au-stagger') || parent.classList.contains('au-stagger-' + direction))) {
226231
const offset = +(parent.getAttribute(attrib) || 0);
227232
parent.setAttribute(attrib, offset + 1);
228-
delay = this._getElementAnimationDelay(parent) * offset;
233+
const delay = this._getElementAnimationDelay(parent) * offset;
229234
this._triggerDOMEvent(animationEvent.staggerNext, element);
230235

231236
setTimeout(() => {
@@ -266,6 +271,9 @@ export let CssAnimator = class CssAnimator {
266271
let animStart;
267272
let animHasStarted = false;
268273
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = evAnimStart => {
274+
if (evAnimStart.target !== element) {
275+
return;
276+
}
269277
animHasStarted = true;
270278
this.isAnimating = true;
271279

@@ -283,6 +291,9 @@ export let CssAnimator = class CssAnimator {
283291
if (!animHasStarted) {
284292
return;
285293
}
294+
if (evAnimEnd.target !== element) {
295+
return;
296+
}
286297

287298
evAnimEnd.stopPropagation();
288299

@@ -329,6 +340,9 @@ export let CssAnimator = class CssAnimator {
329340
let animStart;
330341
let animHasStarted = false;
331342
this._addMultipleEventListener(element, 'webkitAnimationStart animationstart', animStart = evAnimStart => {
343+
if (evAnimStart.target !== element) {
344+
return;
345+
}
332346
animHasStarted = true;
333347
this.isAnimating = true;
334348

@@ -346,6 +360,9 @@ export let CssAnimator = class CssAnimator {
346360
if (!animHasStarted) {
347361
return;
348362
}
363+
if (evAnimEnd.target !== element) {
364+
return;
365+
}
349366

350367
evAnimEnd.stopPropagation();
351368

0 commit comments

Comments
 (0)