Skip to content

Commit d8142d2

Browse files
committed
Remove supurflous OSX webview delegates.
1 parent 16fad5d commit d8142d2

File tree

2 files changed

+1
-40
lines changed

2 files changed

+1
-40
lines changed

WebViewJavascriptBridge/WebViewJavascriptBridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define WVJB_PLATFORM_OSX
1515
#define WVJB_WEBVIEW_TYPE WebView
1616
#define WVJB_WEBVIEW_DELEGATE_TYPE NSObject<WebViewJavascriptBridgeBaseDelegate>
17-
#define WVJB_WEBVIEW_DELEGATE_INTERFACE NSObject<WebViewJavascriptBridgeBaseDelegate>
17+
#define WVJB_WEBVIEW_DELEGATE_INTERFACE NSObject<WebViewJavascriptBridgeBaseDelegate, WebPolicyDelegate>
1818
#elif defined __IPHONE_OS_VERSION_MAX_ALLOWED
1919
#import <UIKit/UIWebView.h>
2020
#define WVJB_PLATFORM_IOS

WebViewJavascriptBridge/WebViewJavascriptBridge.m

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -88,37 +88,16 @@ - (void) _platformSpecificSetup:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WVJ
8888
_webView = webView;
8989
_webViewDelegate = webViewDelegate;
9090

91-
_webView.frameLoadDelegate = self;
92-
_webView.resourceLoadDelegate = self;
9391
_webView.policyDelegate = self;
9492

9593
_base = [[WebViewJavascriptBridgeBase alloc] initWithHandler:(WVJBHandler)messageHandler];
9694
_base.delegate = self;
9795
}
9896

9997
- (void) _platformSpecificDealloc {
100-
_webView.frameLoadDelegate = nil;
101-
_webView.resourceLoadDelegate = nil;
10298
_webView.policyDelegate = nil;
10399
}
104100

105-
- (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
106-
{
107-
if (webView != _webView) { return; }
108-
109-
if (_webViewDelegate && [_webViewDelegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)]) {
110-
[_webViewDelegate webView:webView didFinishLoadForFrame:frame];
111-
}
112-
}
113-
114-
- (void)webView:(WebView *)webView didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
115-
if (webView != _webView) { return; }
116-
117-
if (_webViewDelegate && [_webViewDelegate respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) {
118-
[_webViewDelegate webView:webView didFailLoadWithError:error forFrame:frame];
119-
}
120-
}
121-
122101
- (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
123102
{
124103
if (webView != _webView) { return; }
@@ -141,24 +120,6 @@ - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary
141120
}
142121
}
143122

144-
- (void)webView:(WebView *)webView didCommitLoadForFrame:(WebFrame *)frame {
145-
if (webView != _webView) { return; }
146-
147-
if (_webViewDelegate && [_webViewDelegate respondsToSelector:@selector(webView:didCommitLoadForFrame:)]) {
148-
[_webViewDelegate webView:webView didCommitLoadForFrame:frame];
149-
}
150-
}
151-
152-
- (NSURLRequest *)webView:(WebView *)webView resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
153-
if (webView != _webView) { return request; }
154-
155-
if (_webViewDelegate && [_webViewDelegate respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)]) {
156-
return [_webViewDelegate webView:webView resource:identifier willSendRequest:request redirectResponse:redirectResponse fromDataSource:dataSource];
157-
}
158-
159-
return request;
160-
}
161-
162123

163124

164125
/* Platform specific internals: iOS

0 commit comments

Comments
 (0)