javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 20:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): move nested functions out of if blocks

Browse Source
This commit is contained in:
Tim Lancina
2016-03-31 16:00:43 -05:00
parent 55fb60e09b
commit 3df1ad5192
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ionic/util/dom.ts
View File

@ -91,6 +91,13 @@ export let CSS: {
export function transitionEnd(el: HTMLElement, callback: Function) { export function transitionEnd(el: HTMLElement, callback: Function) {
if (el) { if (el) {
CSS.transitionEnd.split(' ').forEach(eventName => {
el.addEventListener(eventName, onEvent);
});
return unregister;
}
function unregister() { function unregister() {
CSS.transitionEnd.split(' ').forEach(eventName => { CSS.transitionEnd.split(' ').forEach(eventName => {
el.removeEventListener(eventName, onEvent); el.removeEventListener(eventName, onEvent);
@ -103,13 +110,6 @@ export function transitionEnd(el: HTMLElement, callback: Function) {
callback(ev); callback(ev);
} }
} }
CSS.transitionEnd.split(' ').forEach(eventName => {
el.addEventListener(eventName, onEvent);
});
return unregister;
}
} }
export function ready(callback?: Function) { export function ready(callback?: Function) {
@ -124,17 +124,17 @@ export function ready(callback?: Function) {
callback(); callback();
} else { } else {
function completed() {
document.removeEventListener('DOMContentLoaded', completed, false);
window.removeEventListener('load', completed, false);
callback();
}
document.addEventListener('DOMContentLoaded', completed, false); document.addEventListener('DOMContentLoaded', completed, false);
window.addEventListener('load', completed, false); window.addEventListener('load', completed, false);
} }
return promise; return promise;
function completed() {
document.removeEventListener('DOMContentLoaded', completed, false);
window.removeEventListener('load', completed, false);
callback();
}
} }
export function windowLoad(callback?: Function) { export function windowLoad(callback?: Function) {
@ -149,15 +149,16 @@ export function windowLoad(callback?: Function) {
callback(); callback();
} else { } else {
function completed() {
window.removeEventListener('load', completed, false);
callback();
}
window.addEventListener('load', completed, false); window.addEventListener('load', completed, false);
} }
return promise; return promise;
function completed() {
window.removeEventListener('load', completed, false);
callback();
}
} }
export function pointerCoord(ev: any): {x: number, y: number} { export function pointerCoord(ev: any): {x: number, y: number} {