File tree Expand file tree Collapse file tree 3 files changed +16
-5
lines changed
Example/M2DWebViewController
Pod/Classes/M2DWebViewController Expand file tree Collapse file tree 3 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ - (IBAction)show:(id)sender
39
39
else {
40
40
url = [NSURL URLWithString: @" https://github.com/0x0c/M2DWebViewController" ];
41
41
}
42
- M2DWebViewController *viewController = [[M2DWebViewController alloc ] initWithURL: url type: M2DWebViewTypeUIKit ];
42
+ M2DWebViewController *viewController = [[M2DWebViewController alloc ] initWithURL: url type: M2DWebViewTypeWebKit ];
43
43
viewController.delegate = self;
44
44
[self .navigationController pushViewController: viewController animated: YES ];
45
45
}
@@ -108,6 +108,11 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField
108
108
109
109
#pragma mark - M2DWebViewControllerDelegate
110
110
111
+ - (void )m2d_webView : (WKWebView *)webView decidePolicyForNavigationAction : (WKNavigationAction *)navigationAction decisionHandler : (void (^)(WKNavigationActionPolicy ))decisionHandler
112
+ {
113
+ decisionHandler (WKNavigationActionPolicyAllow );
114
+ }
115
+
111
116
- (void )m2d_webViewDidStartLoad : (UIWebView *)webView
112
117
{
113
118
NSLog (@" hoge" );
Original file line number Diff line number Diff line change 9
9
10
10
Pod ::Spec . new do |s |
11
11
s . name = "M2DWebViewController"
12
- s . version = "0.2.1 "
12
+ s . version = "0.2.2 "
13
13
s . summary = "Simple built-in web view controller."
14
14
s . homepage = "https://github.com/0x0c/M2DWebViewController"
15
15
s . license = 'MIT'
Original file line number Diff line number Diff line change @@ -180,8 +180,10 @@ - (void)setToolbarHidden:(BOOL)toolbarHidden
180
180
- (WKWebView * _Nullable)webView : (WKWebView * _Nonnull)webView createWebViewWithConfiguration : (WKWebViewConfiguration * _Nonnull)configuration forNavigationAction : (WKNavigationAction * _Nonnull)navigationAction windowFeatures : (WKWindowFeatures * _Nonnull)windowFeatures
181
181
{
182
182
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];
184
184
}
185
+
186
+ return nil ;
185
187
}
186
188
187
189
- (void )webViewDidClose : (WKWebView * _Nonnull)webView
@@ -223,15 +225,19 @@ - (void)webView:(WKWebView * _Nonnull)webView runJavaScriptTextInputPanelWithPro
223
225
- (BOOL )webView : (WKWebView * _Nonnull)webView shouldPreviewElement : (WKPreviewElementInfo * _Nonnull)elementInfo
224
226
{
225
227
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];
227
229
}
230
+
231
+ return NO ;
228
232
}
229
233
230
234
- (UIViewController * _Nullable)webView : (WKWebView * _Nonnull)webView previewingViewControllerForElement : (WKPreviewElementInfo * _Nonnull)elementInfo defaultActions : (NSArray <id <WKPreviewActionItem>> * _Nonnull)previewActions
231
235
{
232
236
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];
234
238
}
239
+
240
+ return nil ;
235
241
}
236
242
237
243
- (void )webView : (WKWebView * _Nonnull)webView commitPreviewingViewController : (UIViewController * _Nonnull)previewingViewController
You can’t perform that action at this time.
0 commit comments