Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into production

Conflicts:
	DCTUIKit.xcodeproj/project.pbxproj
  • Loading branch information...
commit d0d371a9ccb326c8910f50b0a9a39c967cde59bb 2 parents 5dd1d50 + a6b5171
@danielctull authored
Showing with 8 additions and 3 deletions.
  1. +8 −3 Core Data Based/UIViewController+DCTCoreDataViewController.m
View
11 Core Data Based/UIViewController+DCTCoreDataViewController.m
@@ -35,7 +35,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
*/
#import "UIViewController+DCTCoreDataViewController.h"
-
+#import "UIResponder+DCTNextResponderExtensions.h"
@implementation UIViewController (DCTCoreDataViewController)
@@ -56,7 +56,8 @@ - (void)dct_presentModalCoreDataViewController:(UIViewController<DCTCoreDataView
viewController.managedObjectContext = coreDataSelf.managedObjectContext;
}
- [self presentModalViewController:viewController animated:animated];
+ UIViewController *vc = [self dct_furthestResponderOfClass:[UIViewController class]];
+ [vc presentModalViewController:viewController animated:animated];
}
- (void)dct_presentModalNavigationControllerWithRootCoreDataViewController:(UIViewController<DCTCoreDataViewControllerProtocol> *)viewController animated:(BOOL)animated {
@@ -68,7 +69,11 @@ - (void)dct_presentModalNavigationControllerWithRootCoreDataViewController:(UIVi
UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:viewController];
- [self presentModalViewController:nav animated:animated];
+ UINavigationController *viewControllersNav = viewController.navigationController;
+ if ((viewControllersNav)) nav.navigationBar.tintColor = viewControllersNav.navigationBar.tintColor;
+
+ UIViewController *vc = [self dct_furthestResponderOfClass:[UIViewController class]];
+ [vc presentModalViewController:nav animated:animated];
[nav release];
}
Please sign in to comment.
Something went wrong with that request. Please try again.