mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch 'alpha50' into css-refactor
This commit is contained in:
@@ -79,7 +79,7 @@ export class Tab extends NavController {
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
onInit() {
|
||||
ngOnInit() {
|
||||
if (this._isInitial) {
|
||||
this.parent.select(this);
|
||||
|
||||
@@ -173,7 +173,7 @@ export class Tab extends NavController {
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
onDestroy() {
|
||||
ngOnDestroy() {
|
||||
clearTimeout(this._loadTimer);
|
||||
}
|
||||
|
||||
|
||||
@@ -110,8 +110,8 @@ export class Tabs extends Ion {
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
onInit() {
|
||||
super.onInit();
|
||||
ngOnInit() {
|
||||
super.ngOnInit();
|
||||
this.preloadTabs = (this.preloadTabs !== "false" && this.preloadTabs !== false);
|
||||
|
||||
if (this._highlight) {
|
||||
@@ -277,7 +277,7 @@ class TabButton extends Ion {
|
||||
this.disHover = (config.get('hoverCSS') === false);
|
||||
}
|
||||
|
||||
onInit() {
|
||||
ngOnInit() {
|
||||
this.tab.btn = this;
|
||||
this.hasTitle = !!this.tab.tabTitle;
|
||||
this.hasIcon = !!this.tab.tabIcon;
|
||||
|
||||
@@ -109,7 +109,7 @@ class QuesaritoPage {
|
||||
export class TabsPage {
|
||||
@ViewChildren(Tab) tab : QueryList<Tab>;
|
||||
|
||||
afterViewInit() {
|
||||
ngAfterViewInit() {
|
||||
console.log('Tab', this.tab);
|
||||
console.log(this.tab.first.setRoot);
|
||||
}
|
||||
@@ -128,6 +128,6 @@ export class TabsPage {
|
||||
this.root2 = Tab2;
|
||||
this.root3 = Tab3;
|
||||
}
|
||||
onInit() {
|
||||
ngOnInit() {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user