diff --git a/ionic/components/alert/test/basic/index.ts b/ionic/components/alert/test/basic/index.ts index b3117960e5..cef1da39b3 100644 --- a/ionic/components/alert/test/basic/index.ts +++ b/ionic/components/alert/test/basic/index.ts @@ -234,7 +234,7 @@ class E2EPage { setTimeout(() => { alert.dismiss(); - }, 100); + }, 200); } doDisabledBackdropAlert() { diff --git a/ionic/components/menu/test/basic/e2e.ts b/ionic/components/menu/test/basic/e2e.ts index f9f2e51243..ee5aa0f45e 100644 --- a/ionic/components/menu/test/basic/e2e.ts +++ b/ionic/components/menu/test/basic/e2e.ts @@ -5,5 +5,5 @@ it('should toggle open menu', function() { it('should close menu', function() { - element(by.css('[menuClose=left]')).click(); + element(by.css('.e2eCloseLeftMenu')).click(); }); diff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html index 8ca9375f0a..0052e0b3b9 100644 --- a/ionic/components/menu/test/basic/main.html +++ b/ionic/components/menu/test/basic/main.html @@ -12,7 +12,7 @@ {{p.title}} - diff --git a/ionic/components/slides/slides.ts b/ionic/components/slides/slides.ts index 5f155ab6f7..d6bbe87663 100644 --- a/ionic/components/slides/slides.ts +++ b/ionic/components/slides/slides.ts @@ -454,8 +454,7 @@ export class Slides extends Ion { let zi = new Animation(this.touch.target.children[0]) .duration(this.zoomDuration) - .easing('linear') - .fill('none'); + .easing('linear'); let zw = new Animation(this.touch.target.children[0]) .duration(this.zoomDuration) diff --git a/ionic/util/dom.ts b/ionic/util/dom.ts index 4c4fc2e0eb..2730b47b7d 100644 --- a/ionic/util/dom.ts +++ b/ionic/util/dom.ts @@ -91,7 +91,7 @@ export let CSS: { export function transitionEnd(el: HTMLElement, callback: Function) { if (el) { - function deregister() { + function unregister() { CSS.transitionEnd.split(' ').forEach(eventName => { el.removeEventListener(eventName, onEvent); }); @@ -99,7 +99,7 @@ export function transitionEnd(el: HTMLElement, callback: Function) { function onEvent(ev) { if (el === ev.target) { - deregister(); + unregister(); callback(ev); } } @@ -108,7 +108,7 @@ export function transitionEnd(el: HTMLElement, callback: Function) { el.addEventListener(eventName, onEvent); }); - return deregister; + return unregister; } }