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

Merge branch 'alpha50' into css-refactor

Browse Source
This commit is contained in:
Adam Bradley
2015-12-09 07:47:30 -06:00
parent 0c6f87a541 ec0c146be6
commit 243f03e545
27 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/menu/menu-types.ts
View File

@@ -67,7 +67,7 @@ export class MenuType {
return promise;
}
onDestroy() {
ngOnDestroy() {
this.open && this.open.dispose();
this.close && this.close.dispose();
this.seek && this.seek.dispose();

8
ionic/components/menu/menu.ts
View File

@@ -92,8 +92,8 @@ export class Menu extends Ion {
/**
* @private
*/
onInit() {
super.onInit();
ngOnInit() {
super.ngOnInit();
let self = this;
let content = self.content;
@@ -352,11 +352,11 @@ export class Menu extends Ion {
/**
* @private
*/
onDestroy() {
ngOnDestroy() {
this.app.unregister(this.id);
this._gesture && this._gesture.destroy();
this._targetGesture && this._targetGesture.destroy();
this._type && this._type.onDestroy();
this._type && this._type.ngOnDestroy();
this._cntEle = null;
}