diff --git a/ionic/components/app/app.js b/ionic/components/app/app.js index 4b602dc953..7e519af989 100644 --- a/ionic/components/app/app.js +++ b/ionic/components/app/app.js @@ -45,8 +45,10 @@ export class IonicApp { return this._zone; } - stateChange() { - console.log('stage change'); + stateChange(activeView) { + console.log('stage change', activeView); + + } diff --git a/ionic/components/nav/test/basic/pages/first-page.js b/ionic/components/nav/test/basic/pages/first-page.js index dd508945a4..39d213fe8f 100644 --- a/ionic/components/nav/test/basic/pages/first-page.js +++ b/ionic/components/nav/test/basic/pages/first-page.js @@ -69,14 +69,6 @@ export class FirstPage { console.log('viewDidLeave first page'); } - viewWillCache() { - console.log('viewWillCache first page'); - } - - viewDidCache() { - console.log('viewDidCache first page'); - } - viewWillUnload() { console.log('viewWillUnload first page'); } diff --git a/ionic/components/nav/test/basic/pages/second-page.js b/ionic/components/nav/test/basic/pages/second-page.js index 8a319c707b..4ec528632b 100644 --- a/ionic/components/nav/test/basic/pages/second-page.js +++ b/ionic/components/nav/test/basic/pages/second-page.js @@ -68,14 +68,6 @@ export class SecondPage { console.log('viewDidLeave second page'); } - viewWillCache() { - console.log('viewWillCache second page'); - } - - viewDidCache() { - console.log('viewDidCache second page'); - } - viewWillUnload() { console.log('viewWillUnload second page'); } diff --git a/ionic/components/nav/test/basic/pages/third-page.js b/ionic/components/nav/test/basic/pages/third-page.js index 417cbb2669..9c1a68ef88 100644 --- a/ionic/components/nav/test/basic/pages/third-page.js +++ b/ionic/components/nav/test/basic/pages/third-page.js @@ -49,14 +49,6 @@ export class ThirdPage { console.log('viewDidLeave third page'); } - viewWillCache() { - console.log('viewWillCache third page'); - } - - viewDidCache() { - console.log('viewDidCache third page'); - } - viewWillUnload() { console.log('viewWillUnload third page'); } diff --git a/ionic/components/tabs/tabs.js b/ionic/components/tabs/tabs.js index c3bafdeda1..a12041060c 100644 --- a/ionic/components/tabs/tabs.js +++ b/ionic/components/tabs/tabs.js @@ -110,7 +110,6 @@ export class Tabs extends ViewController { let leavingItem = this.getActive() || new ViewItem(); leavingItem.shouldDestroy = false; leavingItem.shouldCache = true; - leavingItem.willCache(); this.transition(enteringItem, leavingItem, opts, () => { resolve(); diff --git a/ionic/components/view/view-controller.js b/ionic/components/view/view-controller.js index b2c612741b..9508770898 100644 --- a/ionic/components/view/view-controller.js +++ b/ionic/components/view/view-controller.js @@ -4,7 +4,6 @@ import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_compone import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {Injector, bind} from 'angular2/di'; -import {IonicApp} from '../app/app'; import {IonicRouter} from '../../routing/router'; import {ViewItem} from './view-item'; import {NavController} from '../nav/nav-controller'; @@ -27,7 +26,6 @@ export class ViewController { this.loader = injector.get(DynamicComponentLoader); this.viewMngr = injector.get(AppViewManager); this.router = injector.get(IonicRouter); - this.app = injector.get(IonicApp); this.router.addViewController(this); @@ -67,7 +65,6 @@ export class ViewController { let leavingItem = this.getActive() || new ViewItem(); leavingItem.shouldDestroy = false; leavingItem.shouldCache = true; - leavingItem.willCache(); // create a new ViewItem let enteringItem = new ViewItem(this, ComponentType, params); @@ -303,14 +300,11 @@ export class ViewController { item.destroy(); } else if (item.state === CACHED_STATE && item.shouldCache) { - item.cache(); item.shouldCache = false; } } }); - this.app.stateChange(); - // allow clicks again ClickBlock(false); } diff --git a/ionic/components/view/view-item.js b/ionic/components/view/view-item.js index b7582075ea..5ff64bc9bb 100644 --- a/ionic/components/view/view-item.js +++ b/ionic/components/view/view-item.js @@ -159,10 +159,6 @@ export class ViewItem { this.instance._viewWillEnter = new EventEmitter('viewWillEnter'); } - cache() { - this.didCache(); - } - destroy() { for (let i = 0; i < this.disposals.length; i++) { this.disposals[i](); @@ -254,7 +250,6 @@ export class ViewItem { */ willEnter() { this.instance && this.instance.viewWillEnter && this.instance.viewWillEnter(); - this.instance && this.instance._viewWillEnter.next(); } /* @@ -268,7 +263,6 @@ export class ViewItem { navbarView.didEnter(); } this.instance && this.instance.viewDidEnter && this.instance.viewDidEnter(); - this.instance && this.instance._viewDidEnter.next(); } /* @@ -286,20 +280,6 @@ export class ViewItem { this.instance && this.instance.viewDidLeave && this.instance.viewDidLeave(); } - /* - The view is about to become cached. - */ - willCache() { - this.instance && this.instance.viewWillCache && this.instance.viewWillCache(); - } - - /* - The view is now cached. - */ - didCache() { - this.instance && this.instance.viewDidCache && this.instance.viewDidCache(); - } - /* The view is about to be destroyed and have its elements removed. */