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

chore(): remove dup method

Browse Source
This commit is contained in:
Adam Bradley
2015-12-01 22:13:49 -06:00
parent f440f029f3
commit ed72a7a160
1 changed files with 38 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -865,7 +865,7 @@ export class NavController extends Ion {
* @private
*/
_transComplete() {
let wtfScope = wtfCreateScope('ionic.NavController#_transComplete');
let wtfScope = wtfCreateScope('ionic.NavController#_transComplete')();
this._views.forEach(view => {
if (view) {
@@ -898,7 +898,7 @@ export class NavController extends Ion {
// guts of DynamicComponentLoader#loadIntoLocation
this._compiler.compileInHost(viewCtrl.componentType).then(hostProtoViewRef => {
let wtfScope = wtfCreateScope('ionic.NavController#loadPage after compile ' + viewCtrl.name);
let wtfScope = wtfCreateScope('ionic.NavController#loadPage after compile ' + viewCtrl.name)();
let providers = this.providers.concat(Injector.resolve([
provide(ViewController, {useValue: viewCtrl}),
@@ -960,6 +960,9 @@ export class NavController extends Ion {
});
}
/**
* @private
*/
_setZIndex(enteringView, leavingView, direction) {
let enteringPageRef = enteringView && enteringView.pageRef();
if (enteringPageRef) {
@@ -982,6 +985,9 @@ export class NavController extends Ion {
}
}
/**
* @private
*/
_cachePage(viewCtrl, shouldShow) {
// using hidden element attribute to display:none and not render views
// renderAttr of '' means the hidden attribute will be added
@@ -1000,6 +1006,36 @@ export class NavController extends Ion {
}
}
/**
* @private
*/
_cleanup(activeView, previousView, skipDestroy) {
// the active page, and the previous page, should be rendered in dom and ready to go
// all others, like a cached page 2 back, should be display: none and not rendered
let destroys = [];
activeView = activeView || this.getActive();
previousView = previousView || this.getPrevious(activeView);
this._views.forEach(view => {
if (view) {
if (view.shouldDestroy && !skipDestroy) {
destroys.push(view);
} else if (view.isLoaded()) {
let shouldShow = (view === activeView) || (view === previousView);
this._cachePage(view, shouldShow);
}
}
});
// all pages being destroyed should be removed from the list of pages
// and completely removed from the dom
destroys.forEach(view => {
this._remove(view);
view.destroy();
});
}
/**
* @private
*/
@@ -1193,65 +1229,6 @@ export class NavController extends Ion {
return false;
}
/**
* @private
*/
_transComplete() {
let wtfScope = wtfCreateScope('ionic.NavController#_transComplete')();
this._views.forEach(view => {
if (view) {
if (view.shouldDestroy) {
view.didUnload();
} else if (view.state === CACHED_STATE && view.shouldCache) {
view.shouldCache = false;
}
}
});
// allow clicks again, but still set an enable time
// meaning nothing with this page controller can happen for XXms
this.app.setEnabled(true);
this.setTransitioning(false);
this._sbComplete();
this._cleanup();
wtfLeave(wtfScope);
}
/**
* @private
*/
_cleanup(activeView, previousView, skipDestroy) {
// the active page, and the previous page, should be rendered in dom and ready to go
// all others, like a cached page 2 back, should be display: none and not rendered
let destroys = [];
activeView = activeView || this.getActive();
previousView = previousView || this.getPrevious(activeView);
this._views.forEach(view => {
if (view) {
if (view.shouldDestroy && !skipDestroy) {
destroys.push(view);
} else if (view.isLoaded()) {
let shouldShow = (view === activeView) || (view === previousView);
this._cachePage(view, shouldShow);
}
}
});
// all pages being destroyed should be removed from the list of pages
// and completely removed from the dom
destroys.forEach(view => {
this._remove(view);
view.destroy();
});
}
/**
* @private
*/