diff --git a/ionic/util/dom.ts b/ionic/util/dom.ts index 93f4a2cf4c..4d0dd3540e 100644 --- a/ionic/util/dom.ts +++ b/ionic/util/dom.ts @@ -91,25 +91,25 @@ export let CSS: { export function transitionEnd(el: HTMLElement, callback: Function) { if (el) { - function unregister() { - CSS.transitionEnd.split(' ').forEach(eventName => { - el.removeEventListener(eventName, onEvent); - }); - } - - function onEvent(ev) { - if (el === ev.target) { - unregister(); - callback(ev); - } - } - CSS.transitionEnd.split(' ').forEach(eventName => { el.addEventListener(eventName, onEvent); }); return unregister; } + + function unregister() { + CSS.transitionEnd.split(' ').forEach(eventName => { + el.removeEventListener(eventName, onEvent); + }); + } + + function onEvent(ev) { + if (el === ev.target) { + unregister(); + callback(ev); + } + } } export function ready(callback?: Function) { @@ -124,17 +124,17 @@ export function ready(callback?: Function) { callback(); } else { - function completed() { - document.removeEventListener('DOMContentLoaded', completed, false); - window.removeEventListener('load', completed, false); - callback(); - } - document.addEventListener('DOMContentLoaded', completed, false); window.addEventListener('load', completed, false); } return promise; + + function completed() { + document.removeEventListener('DOMContentLoaded', completed, false); + window.removeEventListener('load', completed, false); + callback(); + } } export function windowLoad(callback?: Function) { @@ -149,15 +149,16 @@ export function windowLoad(callback?: Function) { callback(); } else { - function completed() { - window.removeEventListener('load', completed, false); - callback(); - } window.addEventListener('load', completed, false); } return promise; + + function completed() { + window.removeEventListener('load', completed, false); + callback(); + } } export function pointerCoord(ev: any): {x: number, y: number} {