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

fix(nav): change init zIndex to 100

Browse Source
This commit is contained in:
Adam Bradley
2016-03-06 13:27:30 -06:00
parent ad50a11b3c
commit 5863e2c74f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/nav/nav-controller.ts
View File

@ -1656,6 +1656,6 @@ const STATE_TRANS_LEAVE = 'trans_leave';
const STATE_REMOVE = 'remove'; const STATE_REMOVE = 'remove';
const STATE_REMOVE_AFTER_TRANS = 'remove_after_trans'; const STATE_REMOVE_AFTER_TRANS = 'remove_after_trans';
const STATE_FORCE_ACTIVE = 'force_active'; const STATE_FORCE_ACTIVE = 'force_active';
const INIT_ZINDEX = 10; const INIT_ZINDEX = 100;
let ctrlIds = -1; let ctrlIds = -1;

8
ionic/components/nav/test/nav-controller.spec.ts
View File

@ -370,9 +370,9 @@ export function run() {
nav._views = [view1, view2, view3]; nav._views = [view1, view2, view3];
nav._cleanup(); nav._cleanup();
expect(view1.zIndex).toEqual(10); expect(view1.zIndex).toEqual(100);
expect(view2.zIndex).toEqual(11); expect(view2.zIndex).toEqual(101);
expect(view3.zIndex).toEqual(12); expect(view3.zIndex).toEqual(102);
}); });
}); });
@ -575,7 +575,7 @@ export function run() {
let enteringView = new ViewController(); let enteringView = new ViewController();
enteringView.setPageRef({}); enteringView.setPageRef({});
nav._setZIndex(enteringView, null, 'forward'); nav._setZIndex(enteringView, null, 'forward');
expect(enteringView.zIndex).toEqual(10); expect(enteringView.zIndex).toEqual(100);
}); });
it('should set zIndex 1 on second entering view', () => { it('should set zIndex 1 on second entering view', () => {