Merge branch 'ErjanGavalji/cherry-pick-ios9-fix' into release

ErjanGavalji · ErjanGavalji · commit 2c02b356f4e0 · 2015-09-15T17:08:21.000+03:00
diff --git a/ui/action-bar/action-bar.ios.ts b/ui/action-bar/action-bar.ios.ts
@@ -44,7 +44,7 @@ export class ActionBar extends common.ActionBar {
 
         // Find previous ViewController in the navigation stack
         var indexOfViewController = navController.viewControllers.indexOfObject(viewController);
-        if (indexOfViewController !== NSNotFound && indexOfViewController > 0) {
+        if (indexOfViewController < navController.viewControllers.count && indexOfViewController > 0) {
             previousController = navController.viewControllers[indexOfViewController - 1];
         }
    

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export class ActionBar extends common.ActionBar {`
`44`	`44`
`45`	`45`	`// Find previous ViewController in the navigation stack`
`46`	`46`	`var indexOfViewController = navController.viewControllers.indexOfObject(viewController);`
`47`		`- if (indexOfViewController !== NSNotFound && indexOfViewController > 0) {`
	`47`	`+ if (indexOfViewController < navController.viewControllers.count && indexOfViewController > 0) {`
`48`	`48`	`previousController = navController.viewControllers[indexOfViewController - 1];`
`49`	`49`	`}`
`50`	`50`