Merge branch 'master' into 3.0

src/navigation/view-controller.ts

@@ -2,10 +2,10 @@ import { ComponentRef, ElementRef, EventEmitter, Output, Renderer } from '@angul
 
 import { Footer } from '../components/toolbar/toolbar-footer';
 import { Header } from '../components/toolbar/toolbar-header';
-import { isPresent } from '../util/util';
+import { isPresent, assert } from '../util/util';
 import { Navbar } from '../components/navbar/navbar';
 import { NavController } from './nav-controller';
-import { NavOptions } from './nav-util';
+import { NavOptions, STATE_NEW, STATE_INITIALIZED, STATE_ATTACHED, STATE_DESTROYED } from './nav-util';
 import { NavParams } from './nav-params';
 import { Content } from '../components/content/content';
 
@@ -47,7 +47,7 @@ export class ViewController {
   _cmp: ComponentRef<any>;
   _nav: NavController;
   _zIndex: number;
-  _state: number;
+  _state: number = STATE_NEW;
   _cssClass: string;
 
   /**
@@ -166,6 +166,7 @@ export class ViewController {
    */
   dismiss(data?: any, role?: any, navOptions: NavOptions = {}): Promise<any> {
     if (!this._nav) {
+      assert(this._state === STATE_DESTROYED, 'ViewController does not have a valid _nav');
       return Promise.resolve(false);
     }
     if (this.isOverlay && !navOptions.minClickBlockDuration) {
@@ -228,7 +229,7 @@ export class ViewController {
    * @private
    */
   get name(): string {
-    return this.component ? this.component.name : '';
+    return (this.component ? this.component.name : '');
   }
 
   /**
@@ -262,14 +263,12 @@ export class ViewController {
     // _hidden value of '' means the hidden attribute will be added
     // _hidden value of null means the hidden attribute will be removed
     // doing checks to make sure we only update the DOM when actually needed
-    if (this._cmp) {
-      // if it should render, then the hidden attribute should not be on the element
-      if (shouldShow === this._isHidden) {
-        this._isHidden = !shouldShow;
-        let value = (shouldShow ? null : '');
-        // ******** DOM WRITE ****************
-        renderer.setElementAttribute(this.pageRef().nativeElement, 'hidden', value);
-      }
+    // if it should render, then the hidden attribute should not be on the element
+    if (this._cmp && shouldShow === this._isHidden) {
+      this._isHidden = !shouldShow;
+      let value = (shouldShow ? null : '');
+      // ******** DOM WRITE ****************
+      renderer.setElementAttribute(this.pageRef().nativeElement, 'hidden', value);
     }
   }
 
@@ -412,6 +411,7 @@ export class ViewController {
   }
 
   _preLoad() {
+    assert(this._state === STATE_INITIALIZED, 'view state must be INITIALIZED');
     this._lifecycle('PreLoad');
   }
 
@@ -421,6 +421,7 @@ export class ViewController {
    * This event is fired before the component and his children have been initialized.
    */
   _willLoad() {
+    assert(this._state === STATE_INITIALIZED, 'view state must be INITIALIZED');
     this._lifecycle('WillLoad');
   }
 
@@ -433,6 +434,7 @@ export class ViewController {
    * recommended method to use when a view becomes active.
    */
   _didLoad() {
+    assert(this._state === STATE_ATTACHED, 'view state must be ATTACHED');
     this._lifecycle('DidLoad');
   }
 
@@ -441,6 +443,8 @@ export class ViewController {
    * The view is about to enter and become the active view.
    */
   _willEnter() {
+    assert(this._state === STATE_ATTACHED, 'view state must be ATTACHED');
+
     if (this._detached && this._cmp) {
       // ensure this has been re-attached to the change detector
       this._cmp.changeDetectorRef.reattach();
@@ -457,6 +461,8 @@ export class ViewController {
    * will fire, whether it was the first load or loaded from the cache.
    */
   _didEnter() {
+    assert(this._state === STATE_ATTACHED, 'view state must be ATTACHED');
+
     this._nb && this._nb.didEnter();
     this.didEnter.emit(null);
     this._lifecycle('DidEnter');
@@ -511,6 +517,8 @@ export class ViewController {
    * DOM WRITE
    */
   _destroy(renderer: Renderer) {
+    assert(this._state !== STATE_DESTROYED, 'view state must be ATTACHED');
+
     if (this._cmp) {
       if (renderer) {
         // ensure the element is cleaned up for when the view pool reuses this element
@@ -525,6 +533,7 @@ export class ViewController {
     }
 
     this._nav = this._cmp = this.instance = this._cntDir = this._cntRef = this._leavingOpts = this._hdrDir = this._ftrDir = this._nb = this._onDidDismiss = this._onWillDismiss = null;
+    this._state = STATE_DESTROYED;
   }
 
   /**
@@ -535,7 +544,7 @@ export class ViewController {
     const methodName = 'ionViewCan' + lifecycle;
     if (instance && instance[methodName]) {
       try {
-        let result = instance[methodName]();
+        var result = instance[methodName]();
         if (result === false) {
           return false;
         } else if (result instanceof Promise) {