javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: removed deprecated APIs

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-10-13 18:02:45 +02:00
committed by Adam Bradley
parent a06bd69926
commit 35568ba85f
11 changed files with 22 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/navigation/nav-controller-base.ts
View File

@ -883,6 +883,9 @@ export class NavControllerBase extends Ion implements NavController {
}
isTransitioning(): boolean {
if (this._trnsTm === 0) {
return false;
}
// using a timestamp instead of boolean incase something goes wrong
return (this._trnsTm > Date.now());
}
@ -954,28 +957,6 @@ export class NavControllerBase extends Ion implements NavController {
this._viewport = val;
}
/**
* @private
* DEPRECATED: Please use app.getRootNav() instead
*/
get rootNav(): NavController {
// deprecated 07-14-2016 beta.11
console.warn('nav.rootNav() has been deprecated, please use app.getRootNav() instead');
return this._app.getRootNav();
}
/**
* @private
* DEPRECATED: Please use inject the overlays controller and use the present method on the instance instead.
*/
present(): Promise<any> {
// deprecated warning: added beta.11 2016-06-27
console.warn('nav.present() has been deprecated.\n' +
'Please inject the overlay\'s controller and use the present method on the instance instead.');
return Promise.resolve();
}
}
let ctrlIds = -1;

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

@ -147,16 +147,6 @@ export class ViewController {
this._emitter.emit(data);
}
/**
* @private
* onDismiss(..) has been deprecated. Please use onDidDismiss(..) instead
*/
onDismiss(callback: Function) {
// deprecated warning: added beta.11 2016-06-30
console.warn('onDismiss(..) has been deprecated. Please use onDidDismiss(..) instead');
this.onDidDismiss(callback);
}
/**
* Called when the current viewController has be successfully dismissed
*/
@ -412,7 +402,7 @@ export class ViewController {
* @private
*/
_willLoad() {
ctrlFn(this, 'WillLoad');
this._lifecycle('WillLoad');
}
/**
@ -424,17 +414,7 @@ export class ViewController {
* recommended method to use when a view becomes active.
*/
_didLoad() {
// deprecated warning: added 2016-08-14, beta.12
if (this.instance && this.instance.ionViewLoaded) {
try {
console.warn('ionViewLoaded() has been deprecated. Please rename to ionViewDidLoad()');
this.instance.ionViewLoaded();
} catch (e) {
console.error(this.name + ' iionViewLoaded: ' + e.message);
}
}
ctrlFn(this, 'DidLoad');
this._lifecycle('DidLoad');
}
/**
@ -449,7 +429,7 @@ export class ViewController {
}
this.willEnter.emit(null);
ctrlFn(this, 'WillEnter');
this._lifecycle('WillEnter');
}
/**
@ -460,7 +440,7 @@ export class ViewController {
_didEnter() {
this._nb && this._nb.didEnter();
this.didEnter.emit(null);
ctrlFn(this, 'DidEnter');
this._lifecycle('DidEnter');
}
/**
@ -469,7 +449,7 @@ export class ViewController {
*/
_willLeave() {
this.willLeave.emit(null);
ctrlFn(this, 'WillLeave');
this._lifecycle('WillLeave');
}
/**
@ -479,7 +459,7 @@ export class ViewController {
*/
_didLeave() {
this.didLeave.emit(null);
ctrlFn(this, 'DidLeave');
this._lifecycle('DidLeave');
// when this is not the active page
// we no longer need to detect changes
@ -494,17 +474,7 @@ export class ViewController {
*/
_willUnload() {
this.willUnload.emit(null);
ctrlFn(this, 'WillUnload');
// deprecated warning: added 2016-08-14, beta.12
if (this.instance && this.instance.ionViewDidUnload) {
console.warn('ionViewDidUnload() has been deprecated. Please use ionViewWillUnload() instead');
try {
this.instance.ionViewDidUnload();
} catch (e) {
console.error(this.name + ' ionViewDidUnload: ' + e.message);
}
}
this._lifecycle('WillUnload');
}
/**
@ -516,8 +486,9 @@ export class ViewController {
if (renderer) {
// ensure the element is cleaned up for when the view pool reuses this element
// ******** DOM WRITE ****************
renderer.setElementAttribute(this._cmp.location.nativeElement, 'class', null);
renderer.setElementAttribute(this._cmp.location.nativeElement, 'style', null);
const cmpEle = this._cmp.location.nativeElement;
renderer.setElementAttribute(cmpEle, 'class', null);
renderer.setElementAttribute(cmpEle, 'style', null);
}
// completely destroy this component. boom.
@ -546,27 +517,26 @@ export class ViewController {
return instance[methodName]();
} catch (e) {
console.error(`${this.name} ionViewCan${lifecycle} error: ${e}`);
console.error(`${this.name} ${methodName} error: ${e.message}`);
return false;
}
}
return true;
}
}
function ctrlFn(viewCtrl: ViewController, fnName: string) {
if (viewCtrl.instance) {
// fire off ionView lifecycle instance method
if (viewCtrl.instance['ionView' + fnName]) {
_lifecycle(lifecycle: string) {
let instance = this.instance;
let methodName = 'ionView' + lifecycle;
if (instance && instance[methodName]) {
try {
viewCtrl.instance['ionView' + fnName]();
instance[methodName]();
} catch (e) {
console.error(viewCtrl.name + ' ionView' + fnName + ': ' + e.message);
console.error(`${this.name} ${methodName} error: ${e.message}`);
}
}
}
}