From 2b3c14b608d1fb6c41b469e7ed3f001f40d62d5a Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Fri, 20 Apr 2018 16:08:38 +0200
Subject: [PATCH] fix(angular): platform ready()

---
 angular/src/providers/platform.ts               | 17 +++++++++++++----
 .../components/action-sheet/action-sheet.tsx    |  3 ++-
 core/src/components/router/test/parser.spec.tsx |  5 -----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/angular/src/providers/platform.ts b/angular/src/providers/platform.ts
index 0be38be5e64..2c87cd0a0de 100644
--- a/angular/src/providers/platform.ts
+++ b/angular/src/providers/platform.ts
@@ -1,15 +1,24 @@
 
 import { PlatformConfig } from '@ionic/core';
+import { HostListener } from '@angular/core';
 
 export class Platform {
 
-  private _platforms: PlatformConfig[];
+  private _platforms: PlatformConfig[] = [];
   private _readyPromise: Promise<any>;
-  private _readyResolve: any;
 
   constructor() {
-    this._readyPromise = new Promise(res => { this._readyResolve = res; } );
+    let readyResolve: Function;
+    this._readyPromise = new Promise(res => { readyResolve = res; } );
+    if ((window as any)['cordova']) {
+      window.addEventListener('deviceready', () => {
+        readyResolve();
+      });
+    } else {
+      readyResolve();
+    }
   }
+
   /**
    * @returns {boolean} returns true/false based on platform.
    * @description
@@ -102,7 +111,7 @@ export class Platform {
   }
 
 
-  ready(): Promise<string> {
+  ready(): Promise<void> {
     return this._readyPromise;
   }
 
diff --git a/core/src/components/action-sheet/action-sheet.tsx b/core/src/components/action-sheet/action-sheet.tsx
index 9625cf9d42a..0e7ffa69d77 100644
--- a/core/src/components/action-sheet/action-sheet.tsx
+++ b/core/src/components/action-sheet/action-sheet.tsx
@@ -20,9 +20,10 @@ import mdLeaveAnimation from './animations/md.leave';
 })
 export class ActionSheet implements OverlayInterface {
 
-  presented = false;
   mode!: Mode;
   color!: string;
+
+  presented = false;
   animation?: Animation;
 
   @Element() el!: HTMLElement;
diff --git a/core/src/components/router/test/parser.spec.tsx b/core/src/components/router/test/parser.spec.tsx
index 8827b07bb23..4a977ca070f 100644
--- a/core/src/components/router/test/parser.spec.tsx
+++ b/core/src/components/router/test/parser.spec.tsx
@@ -89,11 +89,6 @@ describe('parser', () => {
     win = new TestWindow();
   });
 });
-export class TestWindow2 {
-
-}
-export declare interface TestWindow2 extends Window {}
-
 
 export function mockRouteElement(win: Window, path: string, component: string) {
   const el = win.document.createElement('ion-route');