open website in same window

0x0c · Dec 22, 2014 · 0c56b7a · 0c56b7a
1 parent 2637b0b
commit 0c56b7a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/Pod/Classes/M2DWebViewController/M2DWebViewController.h b/Pod/Classes/M2DWebViewController/M2DWebViewController.h
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, M2DWebViewType) {
 	M2DWebViewTypeAutoSelect
 };
 
-@interface M2DWebViewController : UIViewController <WKNavigationDelegate, UIWebViewDelegate>
+@interface M2DWebViewController : UIViewController <WKUIDelegate, WKNavigationDelegate, UIWebViewDelegate>
 {
 	NSURL *url_;
 	UIBarButtonItem *goForwardButton_;

diff --git a/Pod/Classes/M2DWebViewController/M2DWebViewController.m b/Pod/Classes/M2DWebViewController/M2DWebViewController.m
@@ -53,10 +53,6 @@ + (UIImage *)m2d_arrowIconWithDirection:(M2DArrowIconDirection)direction size:(C
 
 @end
 
-
-////////////////////////////////////////////////////////////////////////////////
-
-
 @interface M2DWebViewController ()
 
 @property (nonatomic, copy) UIImage *backArrowImage;
@@ -166,7 +162,18 @@ - (void)setSmoothScroll:(BOOL)smoothScroll
 	}
 }
 
-#pragma mark - WKWebViewDelegate
+#pragma mark - WKUIDelegate
+
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
+{
+	if (!navigationAction.targetFrame.isMainFrame) {
+		[webView loadRequest:navigationAction.request];
+	}
+
+	return nil;
+}
+
+#pragma mark - WKNavigationDelegate
 
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
@@ -292,6 +299,11 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
 	[self.navigationController.toolbar setItems:items];
 }
 
+- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType
+{
+	return YES;
+}
+
 #pragma mark -
 
 - (void)goForward:(id)sender