javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(navcontroller): exceptions inside lifecycle events are printed properly

Browse Source 
fixes #10974
This commit is contained in:
Manuel Mtz-Almeida
2017-04-19 23:02:43 +02:00
parent a5a85def5a
commit 95c06a53cc
7 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/navigation/view-controller.ts
View File

@ -105,7 +105,11 @@ export class ViewController {
/** @hidden */
@Output() private _emitter: EventEmitter<any> = new EventEmitter();
constructor(public component?: any, data?: any, rootCssClass: string = DEFAULT_CSS_CLASS) {
constructor(
public component?: any,
data?: any,
rootCssClass: string = DEFAULT_CSS_CLASS
) {
// passed in data could be NavParams, but all we care about is its data object
this.data = (data instanceof NavParams ? data.data : (isPresent(data) ? data : {}));
@ -541,7 +545,7 @@ export class ViewController {
/**
* @hidden
*/
_lifecycleTest(lifecycle: string): Promise<any> {
_lifecycleTest(lifecycle: string): Promise<boolean> {
const instance = this.instance;
const methodName = 'ionViewCan' + lifecycle;
if (instance && instance[methodName]) {
@ -561,16 +565,14 @@ export class ViewController {
return Promise.resolve(true);
}
/**
* @hidden
*/
_lifecycle(lifecycle: string) {
const instance = this.instance;
const methodName = 'ionView' + lifecycle;
if (instance && instance[methodName]) {
try {
instance[methodName]();
} catch (e) {
console.error(`${this.name} ${methodName} error: ${e.message}`);
}
instance[methodName]();
}
}