退出代码查看 - bugfix

wanghengheng · wanghengheng · commit d0e6b665e0d5 · 2015-12-29T17:22:08.000+08:00
diff --git a/Coding_iOS/Controllers/CodeListViewController.m b/Coding_iOS/Controllers/CodeListViewController.m
@@ -55,16 +55,10 @@ - (void)rightNavBtnClicked{
                 break;
             case 1:{
                 [weakSelf.navigationController.viewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(UIViewController *obj, NSUInteger idx, BOOL *stop) {
-                    if (![obj isKindOfClass:[weakSelf class]]) {
-                        if ([obj isKindOfClass:[ProjectViewController class]]) {
-                            if ([(ProjectViewController *)obj curType] != ProjectViewTypeCodes) {
-                                *stop = YES;
-                            }
-                        }else{
-                            *stop = YES;
-                        }
-                    }
-                    if (*stop) {
+                    if (![obj isKindOfClass:[CodeViewController class]] &&
+                        ![obj isKindOfClass:[CodeListViewController class]] &&
+                        !([obj isKindOfClass:[ProjectViewController class]] && [(ProjectViewController *)obj curType] == ProjectViewTypeCodes)) {
+                        *stop = YES;
                         [weakSelf.navigationController popToViewController:obj animated:YES];
                     }
                 }];
diff --git a/Coding_iOS/Controllers/CodeViewController.m b/Coding_iOS/Controllers/CodeViewController.m
@@ -11,6 +11,7 @@
 #import "WebContentManager.h"
 #import "ProjectCommitsViewController.h"
 #import "ProjectViewController.h"
+#import "CodeListViewController.h"
 
 @interface CodeViewController ()
 @property (strong, nonatomic) UIWebView *webContentView;
@@ -158,16 +159,10 @@ - (void)rightNavBtnClicked{
                 break;
             case 1:{
                 [weakSelf.navigationController.viewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(UIViewController *obj, NSUInteger idx, BOOL *stop) {
-                    if (![obj isKindOfClass:[weakSelf class]]) {
-                        if ([obj isKindOfClass:[ProjectViewController class]]) {
-                            if ([(ProjectViewController *)obj curType] != ProjectViewTypeCodes) {
-                                *stop = YES;
-                            }
-                        }else{
-                            *stop = YES;
-                        }
-                    }
-                    if (*stop) {
+                    if (![obj isKindOfClass:[CodeViewController class]] &&
+                        ![obj isKindOfClass:[CodeListViewController class]] &&
+                        !([obj isKindOfClass:[ProjectViewController class]] && [(ProjectViewController *)obj curType] == ProjectViewTypeCodes)) {
+                        *stop = YES;
                         [weakSelf.navigationController popToViewController:obj animated:YES];
                     }
                 }];
