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(overlay): actionsheet/popup

Browse Source
This commit is contained in:
Adam Bradley
2015-10-04 22:35:54 -05:00
parent dfe19a962d
commit 3324f3cc90
13 changed files with 264 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/nav/nav-controller.ts
View File

@@ -171,7 +171,7 @@ export class NavController extends Ion {
// the active view is going to be the leaving one (if one exists)
let leavingView = this.getActive() || new ViewController();
leavingView.shouldCache = (util.isBoolean(opts.cacheleavingView) ? opts.cacheleavingView : true);
leavingView.shouldCache = (util.isBoolean(opts.cacheLeavingView) ? opts.cacheLeavingView : true);
leavingView.shouldDestroy = !leavingView.shouldCache;
if (leavingView.shouldDestroy) {
leavingView.willUnload();
@@ -215,7 +215,7 @@ export class NavController extends Ion {
// get the active view and set that it is staged to be leaving
// was probably the one popped from the stack
let leavingView = this.getActive() || new ViewController();
leavingView.shouldCache = (util.isBoolean(opts.cacheleavingView) ? opts.cacheleavingView : false);
leavingView.shouldCache = (util.isBoolean(opts.cacheLeavingView) ? opts.cacheLeavingView : false);
leavingView.shouldDestroy = !leavingView.shouldCache;
if (leavingView.shouldDestroy) {
leavingView.willUnload();
@@ -341,7 +341,7 @@ export class NavController extends Ion {
opts.animate = opts.animate || false;
// ensure leaving views are not cached, and should be destroyed
opts.cacheleavingView = false;
opts.cacheLeavingView = false;
// get the views to auto remove without having to do a transiton for each
// the last view (the currently active one) will do a normal transition out

2
ionic/components/nav/view-controller.ts
View File

@@ -14,8 +14,6 @@ export class ViewController {
this.state = 0;
this.disposals = [];
this._nbItms = [];
this.navbarTemplateRef = null;
}