mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 04:14:21 +08:00
Merge remote-tracking branch 'origin/master'
Conflicts: src/components/app/_scaffolding.scss
This commit is contained in:
@ -36,11 +36,9 @@ export class Tabs {
|
||||
@NgElement() ngElement: NgElement
|
||||
) {
|
||||
this.domElement = ngElement.domElement
|
||||
|
||||
this.domElement.classList.add('pane')
|
||||
|
||||
this.config = Tabs.config.invoke(this)
|
||||
|
||||
this.tabs = []
|
||||
}
|
||||
|
||||
@ -56,10 +54,7 @@ export class Tabs {
|
||||
if (this.selectedTab !== tab) {
|
||||
this.select(tab)
|
||||
} else if (tab._stack.length >= 2) {
|
||||
while (tab._stack.length > 2) {
|
||||
tab.pop({ sync: true }) // pop with no animation
|
||||
}
|
||||
tab.pop() //pop last one with animation
|
||||
tab.popTo(0)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user