javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): use custom typing, remove interfaces

Browse Source 
add protected, rename nav `remove` to `removeIndex`

resolves #12823
This commit is contained in:
Brandy Carney
2017-10-17 13:17:54 -04:00
parent 7fc0310896
commit a932e673ff
53 changed files with 661 additions and 6948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/src/components/loading-controller/loading-controller.tsx
View File

@@ -18,7 +18,7 @@ export class LoadingController {
const id = this.ids++;
// give this loading a unique id
loading.id = `loading-${id}`;
loading.loadingId = `loading-${id}`;
loading.style.zIndex = (20000 + id).toString();
// convert the passed in loading options into props
@@ -31,7 +31,7 @@ export class LoadingController {
// store the resolve function to be called later up when the loading loads
return new Promise<Loading>(resolve => {
this.loadingResolves[loading.id] = resolve;
this.loadingResolves[loading.loadingId] = resolve;
});
}
@@ -39,10 +39,10 @@ export class LoadingController {
@Listen('body:ionLoadingDidLoad')
protected viewDidLoad(ev: LoadingEvent) {
const loading = ev.detail.loading;
const loadingResolve = this.loadingResolves[loading.id];
const loadingResolve = this.loadingResolves[loading.loadingId];
if (loadingResolve) {
loadingResolve(loading);
delete this.loadingResolves[loading.id];
delete this.loadingResolves[loading.loadingId];
}
}