Skip to content

Commit 29cde1e

Browse files
committed
Fix warning.
1 parent d41d219 commit 29cde1e

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Example/M2DWebViewController/M2DViewController.m

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ - (IBAction)show:(id)sender
3939
else {
4040
url = [NSURL URLWithString:@"https://github.com/0x0c/M2DWebViewController"];
4141
}
42-
M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url type:M2DWebViewTypeUIKit];
42+
M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url type:M2DWebViewTypeWebKit];
4343
viewController.delegate = self;
4444
[self.navigationController pushViewController:viewController animated:YES];
4545
}
@@ -108,6 +108,11 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField
108108

109109
#pragma mark - M2DWebViewControllerDelegate
110110

111+
- (void)m2d_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
112+
{
113+
decisionHandler(WKNavigationActionPolicyAllow);
114+
}
115+
111116
- (void)m2d_webViewDidStartLoad:(UIWebView *)webView
112117
{
113118
NSLog(@"hoge");

M2DWebViewController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Pod::Spec.new do |s|
1111
s.name = "M2DWebViewController"
12-
s.version = "0.2.1"
12+
s.version = "0.2.2"
1313
s.summary = "Simple built-in web view controller."
1414
s.homepage = "https://github.com/0x0c/M2DWebViewController"
1515
s.license = 'MIT'

Pod/Classes/M2DWebViewController/M2DWebViewController.m

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,10 @@ - (void)setToolbarHidden:(BOOL)toolbarHidden
180180
- (WKWebView * _Nullable)webView:(WKWebView * _Nonnull)webView createWebViewWithConfiguration:(WKWebViewConfiguration * _Nonnull)configuration forNavigationAction:(WKNavigationAction * _Nonnull)navigationAction windowFeatures:(WKWindowFeatures * _Nonnull)windowFeatures
181181
{
182182
if ([self.delegate respondsToSelector:@selector(m2d_webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:)]) {
183-
[self.delegate m2d_webView:webView createWebViewWithConfiguration:configuration forNavigationAction:navigationAction windowFeatures:windowFeatures];
183+
return [self.delegate m2d_webView:webView createWebViewWithConfiguration:configuration forNavigationAction:navigationAction windowFeatures:windowFeatures];
184184
}
185+
186+
return nil;
185187
}
186188

187189
- (void)webViewDidClose:(WKWebView * _Nonnull)webView
@@ -223,15 +225,19 @@ - (void)webView:(WKWebView * _Nonnull)webView runJavaScriptTextInputPanelWithPro
223225
- (BOOL)webView:(WKWebView * _Nonnull)webView shouldPreviewElement:(WKPreviewElementInfo * _Nonnull)elementInfo
224226
{
225227
if ([self.delegate respondsToSelector:@selector(m2d_webView:shouldPreviewElement:)]) {
226-
[self.delegate m2d_webView:webView shouldPreviewElement:elementInfo];
228+
return [self.delegate m2d_webView:webView shouldPreviewElement:elementInfo];
227229
}
230+
231+
return NO;
228232
}
229233

230234
- (UIViewController * _Nullable)webView:(WKWebView * _Nonnull)webView previewingViewControllerForElement:(WKPreviewElementInfo * _Nonnull)elementInfo defaultActions:(NSArray<id <WKPreviewActionItem>> * _Nonnull)previewActions
231235
{
232236
if ([self.delegate respondsToSelector:@selector(m2d_webView:previewingViewControllerForElement:defaultActions:)]) {
233-
[self.delegate m2d_webView:webView previewingViewControllerForElement:elementInfo defaultActions:previewActions];
237+
return [self.delegate m2d_webView:webView previewingViewControllerForElement:elementInfo defaultActions:previewActions];
234238
}
239+
240+
return nil;
235241
}
236242

237243
- (void)webView:(WKWebView * _Nonnull)webView commitPreviewingViewController:(UIViewController * _Nonnull)previewingViewController

0 commit comments

Comments
 (0)