Fixed ranging bug (#4)

bfolder · Oct 1, 2015 · 417c736 · 417c736
1 parent 2a3cb9a
commit 417c736
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/BFNavigationController/BFNavigationController.m b/BFNavigationController/BFNavigationController.m
@@ -266,11 +266,9 @@ - (NSArray *)popToRootViewControllerAnimated:(BOOL)animated {
     }
 
     NSViewController *rootController = [_viewControllers objectAtIndex:0];
-    [_viewControllers removeObject: rootController];
+    [_viewControllers removeObject:rootController];
 
-    NSRange poppedRange = NSMakeRange(1, [_viewControllers count] - 1);
-    NSArray *dispControllers = [_viewControllers subarrayWithRange:poppedRange];
-
+    NSArray *dispControllers = [NSArray arrayWithArray:_viewControllers];
     _viewControllers = [NSMutableArray arrayWithObject:rootController];
 
     // Navigate
@@ -283,7 +281,7 @@ - (NSArray *)popToRootViewControllerAnimated:(BOOL)animated {
     }
 
     // Return popping controller stack
-    return dispControllers;
+    return [[dispControllers reverseObjectEnumerator] allObjects];
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -292,15 +290,14 @@ - (NSArray *)popToViewController:(NSViewController *)viewController animated:(BO
     NSViewController *visibleController = self.visibleViewController;
 
     // Don't pop last controller
-    if (![_viewControllers containsObject:viewController] || visibleController == viewController) {
+    if (![_viewControllers containsObject: viewController] || visibleController == viewController)
         return [NSArray array];
-    }
 
-    NSUInteger index = [_viewControllers indexOfObject:viewController];
+    NSUInteger index = [_viewControllers indexOfObject: viewController];
     NSUInteger length = [_viewControllers count] - (index + 1);
     NSRange range = NSMakeRange(index + 1, length);
-    NSArray *dispControllers = [_viewControllers subarrayWithRange:range];
-    [_viewControllers removeObjectsInArray:dispControllers];
+    NSArray *dispControllers = [_viewControllers subarrayWithRange: range];
+    [_viewControllers removeObjectsInArray: dispControllers];
 
     // Navigate
     [self _navigateFromViewController:visibleController toViewController:viewController animated:animated push:NO];
@@ -312,7 +309,7 @@ - (NSArray *)popToViewController:(NSViewController *)viewController animated:(BO
     }
 
     // Return popping controller stack
-    return dispControllers;
+    return [[dispControllers reverseObjectEnumerator] allObjects];
 }
 
 @end
diff --git a/...odeproj/project.xcworkspace/xcuserdata/bfolder.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/bfolder.xcuserdatad/UserInterfaceState.xcuserstate