fix(navcontroller): lazy loading is queued

Author: manucorporat

scripts/gulp/tasks/test.ts

@@ -85,6 +85,7 @@ function karmaTest(watch: boolean, done: Function) {
 
   let karmaConfig = {
     configFile: join(SCRIPTS_ROOT, 'karma/karma.conf.js'),
+    singleRun: true,
   };
 
   if (watch) {
@@ -96,6 +97,9 @@ function karmaTest(watch: boolean, done: Function) {
       args: ['--grep', argv.testGrep]
     };
   }
+  if (typeof argv.debug !== 'undefined') {
+    karmaConfig.singleRun = false;
+  }
 
   new karma.Server(karmaConfig, done).start();
 }

scripts/karma/system.config.js

@@ -4,7 +4,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
 
 // disable console debugs/errors/warns from printing out
 console.debug = () => {};
-console.error = () => {};
+// console.error = () => {};
 console.warn = () => {};
 
 __karma__.loaded = function () {};

src/animations/animation.ts

@@ -103,6 +103,13 @@ export class Animation {
     return 0;
   }
 
+  /**
+   * Returns if the animation is a root one.
+   */
+  isRoot(): boolean {
+    return !this.parent;
+  }
+
   /**
    * Set the duration for this animation.
    */

src/components/app/test/app.spec.ts

@@ -167,8 +167,9 @@ describe('App', () => {
         expect(plt.exitApp).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
-      });
+        });
     });
 
     it('should pop the second view in the root nav', () => {

src/components/nav/test/basic/pages/first-page/first-page.html

@@ -42,7 +42,7 @@
         </ion-item>
         <ion-item>
           <ion-label>Toggle Can Leave</ion-label>
-          <ion-toggle (click)="canLeave = !canLeave"></ion-toggle>
+          <ion-toggle [(ngModel)]="canLeave"></ion-toggle>
         </ion-item>
         <button ion-item (click)="viewDismiss()">View Dismiss</button>
         <button ion-item (click)="quickPush()">New push during transition</button>

src/components/nav/test/nav.spec.ts

@@ -34,6 +34,7 @@ describe('Nav', () => {
         expect(nav.setPages).toHaveBeenCalledWith(knownViews, null, null);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -56,6 +57,7 @@ describe('Nav', () => {
         expect(nav.setPages).toHaveBeenCalledWith(knownViews, null, null);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -72,7 +74,8 @@ describe('Nav', () => {
        promise.then(() => {
         expect(nav.push).toHaveBeenCalled();
         done();
-      }).catch((err: Error) => {
+       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });

src/components/tabs/tab.ts

@@ -292,7 +292,7 @@ export class Tab extends NavControllerBase {
   /**
    * @hidden
    */
-  load(opts: NavOptions, done?: Function) {
+  load(opts: NavOptions, done?: () => void) {
     if (!this._loaded && this.root) {
       this.setElementClass('show-tab', true);
       this.push(this.root, this.rootParams, opts, done);
@@ -305,7 +305,7 @@ export class Tab extends NavControllerBase {
       this._dom.read(() => {
         this.resize();
       });
-      done(true);
+      done();
     }
   }
 

src/components/tabs/test/tabs.spec.ts

@@ -162,7 +162,6 @@ describe('Tabs', () => {
     it('should get the tab', () => {
       var tabs = mockTabs();
       var tab0 = mockTab(tabs);
-      tab0.setRoot(<any>{});
       var tab1 = mockTab(tabs);
 
       expect(tabs.getIndex(tab0)).toEqual(0);

src/navigation/nav-controller-base.ts

@@ -8,7 +8,7 @@ import { NavControllerBase } from './nav-controller-base';
 import { Transition } from '../transitions/transition';
 
 
-export function getComponent(linker: DeepLinker, nameOrPageOrView: any, params?: any) {
+export function getComponent(linker: DeepLinker, nameOrPageOrView: any, params?: any): Promise<ViewController> {
   if (typeof nameOrPageOrView === 'function') {
     return Promise.resolve(
       new ViewController(nameOrPageOrView, params)
@@ -24,7 +24,7 @@ export function getComponent(linker: DeepLinker, nameOrPageOrView: any, params?:
   return Promise.resolve(null);
 }
 
-export function convertToView(linker: DeepLinker, nameOrPageOrView: any, params: any) {
+export function convertToView(linker: DeepLinker, nameOrPageOrView: any, params: any): Promise<ViewController> {
   if (nameOrPageOrView) {
     if (isViewController(nameOrPageOrView)) {
       // is already a ViewController
@@ -34,11 +34,10 @@ export function convertToView(linker: DeepLinker, nameOrPageOrView: any, params:
     return getComponent(linker, nameOrPageOrView, params);
   }
 
-  console.error(`invalid page component: ${nameOrPageOrView}`);
   return Promise.resolve(null);
 }
 
-export function convertToViews(linker: DeepLinker, pages: any[]) {
+export function convertToViews(linker: DeepLinker, pages: any[]): Promise<ViewController[]> {
   const views: Promise<ViewController>[] = [];
   if (isArray(pages)) {
     for (var i = 0; i < pages.length; i++) {
@@ -147,6 +146,14 @@ export interface NavLink {
   defaultHistory?: any[];
 }
 
+export interface NavResult {
+  hasCompleted: boolean;
+  requiresTransition: boolean;
+  enteringName?: string;
+  leavingName?: string;
+  direction?: string;
+}
+
 export interface NavSegment {
   id: string;
   name: string;
@@ -188,12 +195,13 @@ export interface TransitionRejectFn {
 export interface TransitionInstruction {
   opts: NavOptions;
   insertStart?: number;
-  insertViews?: ViewController[];
+  insertViews?: any[];
   removeView?: ViewController;
   removeStart?: number;
   removeCount?: number;
-  resolve?: TransitionResolveFn;
-  reject?: TransitionRejectFn;
+  resolve?: (hasCompleted: boolean) => void;
+  reject?: (rejectReason: string) => void;
+  done?: Function;
   leavingRequiresTransition?: boolean;
   enteringRequiresTransition?: boolean;
   requiresTransition?: boolean;

src/navigation/nav-util.ts

@@ -284,6 +284,7 @@ describe('DeepLinker', () => {
         expect(result.length).toEqual(1);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });

src/navigation/test/deep-linker.spec.ts

@@ -16,6 +16,7 @@ describe('Overlay Proxy', () => {
         expect(instance.overlay.dismiss).toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -69,6 +70,7 @@ describe('Overlay Proxy', () => {
         expect(knownOverlay.onWillDismiss).toHaveBeenCalledWith(handler);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -91,6 +93,7 @@ describe('Overlay Proxy', () => {
         expect(deepLinker.getComponentFromName).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -112,6 +115,7 @@ describe('Overlay Proxy', () => {
         expect(deepLinker.getComponentFromName).toHaveBeenCalledWith(componentName);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });

src/navigation/test/nav-controller.spec.ts

@@ -541,26 +541,24 @@ export class ViewController {
   /**
    * @hidden
    */
-  _lifecycleTest(lifecycle: string): boolean | Promise<any> {
+  _lifecycleTest(lifecycle: string): Promise<any> {
     const instance = this.instance;
     const methodName = 'ionViewCan' + lifecycle;
     if (instance && instance[methodName]) {
       try {
         var result = instance[methodName]();
-        if (result === false) {
-          return false;
-        } else if (result instanceof Promise) {
+        if (result instanceof Promise) {
           return result;
         } else {
-          return true;
+          // Any value but explitic false, should be true
+          return Promise.resolve(result !== false);
         }
 
       } catch (e) {
-        console.error(`${this.name} ${methodName} error: ${e.message}`);
-        return false;
+        return Promise.reject(`${this.name} ${methodName} error: ${e.message}`);
       }
     }
-    return true;
+    return Promise.resolve(true);
   }
 
   _lifecycle(lifecycle: string) {

src/navigation/test/overlay-proxy.spec.ts

@@ -20,12 +20,12 @@ export class TransitionController {
   constructor(public plt: Platform, private _config: Config) {}
 
   getRootTrnsId(nav: NavControllerBase): number {
-    let parent = <NavControllerBase>nav.parent;
-    while (parent) {
-      if (isPresent(parent._trnsId)) {
-        return parent._trnsId;
+    nav = <NavControllerBase>nav.parent;
+    while (nav) {
+      if (isPresent(nav._trnsId)) {
+        return nav._trnsId;
       }
-      parent = parent.parent;
+      nav = nav.parent;
     }
     return null;
   }

src/navigation/view-controller.ts

@@ -24,7 +24,12 @@ export class Transition extends Animation {
   parent: Transition;
   trnsId: number;
 
-  constructor(plt: Platform, public enteringView: ViewController, public leavingView: ViewController, opts: AnimationOptions) {
+  constructor(
+    plt: Platform,
+    public enteringView: ViewController,
+    public leavingView: ViewController,
+    opts: AnimationOptions
+    ) {
     super(plt, null, opts);
   }
 
@@ -34,13 +39,12 @@ export class Transition extends Animation {
     this._trnsStart = trnsStart;
   }
 
-  isRoot(): boolean {
-    return !this.parent;
-  }
-
   start() {
     this._trnsStart && this._trnsStart();
     this._trnsStart = null;
+
+    // bubble up start
+    this.parent && this.parent.start();
   }
 
   destroy() {

src/transitions/transition-controller.ts

@@ -19,7 +19,8 @@ describe('module-loader', () => {
         promise.then((response) => {
           expect(ngModuleLoader.load).toHaveBeenCalledWith(pathPrefix, exportSuffix);
         }).catch((err: Error) => {
-          done(err);
+            fail(err);
+            done(err);
         });
     });