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

Revert "Merge branch 'master' of https://github.com/driftyco/ionic"

Browse Source 
This reverts commit 8945bf906d68d469e4653a9db2f564bc588eb0d6, reversing
changes made to f4fac225fa3a9151565a1e3c3ccb334405b6a57f.
This commit is contained in:
perry
2016-07-18 19:24:56 -05:00
parent 8945bf906d
commit 4a6086c1f8
86 changed files with 3835 additions and 5489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/content/content.ts
View File

@ -524,7 +524,7 @@ export class Content extends Ion {
ele = parentEle;
let tabbarEle: HTMLElement;
while (ele && ele.tagName !== 'ION-MODAL') {
while (ele && ele.tagName !== 'ION-MODAL' && !ele.classList.contains('tab-subpage')) {
if (ele.tagName === 'ION-TABS') {
tabbarEle = <HTMLElement>ele.firstElementChild;