From 5863e2c74ff6351e4aad9ef79bed017fb1faa133 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sun, 6 Mar 2016 13:27:30 -0600 Subject: [PATCH] fix(nav): change init zIndex to 100 --- ionic/components/nav/nav-controller.ts | 2 +- ionic/components/nav/test/nav-controller.spec.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index 8392de527a..340654d358 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -1656,6 +1656,6 @@ const STATE_TRANS_LEAVE = 'trans_leave'; const STATE_REMOVE = 'remove'; const STATE_REMOVE_AFTER_TRANS = 'remove_after_trans'; const STATE_FORCE_ACTIVE = 'force_active'; -const INIT_ZINDEX = 10; +const INIT_ZINDEX = 100; let ctrlIds = -1; diff --git a/ionic/components/nav/test/nav-controller.spec.ts b/ionic/components/nav/test/nav-controller.spec.ts index 0e34b7be05..7bffb87a06 100644 --- a/ionic/components/nav/test/nav-controller.spec.ts +++ b/ionic/components/nav/test/nav-controller.spec.ts @@ -370,9 +370,9 @@ export function run() { nav._views = [view1, view2, view3]; nav._cleanup(); - expect(view1.zIndex).toEqual(10); - expect(view2.zIndex).toEqual(11); - expect(view3.zIndex).toEqual(12); + expect(view1.zIndex).toEqual(100); + expect(view2.zIndex).toEqual(101); + expect(view3.zIndex).toEqual(102); }); }); @@ -575,7 +575,7 @@ export function run() { let enteringView = new ViewController(); enteringView.setPageRef({}); nav._setZIndex(enteringView, null, 'forward'); - expect(enteringView.zIndex).toEqual(10); + expect(enteringView.zIndex).toEqual(100); }); it('should set zIndex 1 on second entering view', () => {