Revert "Merge pull request #70 from shuizhongyueming/master"

This reverts commit 49579d6, reversing changes made to 18b51d2. The added changes only worked for iOS projects, but broke OSX builds.
marcuswestin · May 22, 2014 · 6da9284 · 6da9284
1 parent 49579d6
commit 6da9284
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
@@ -22,28 +22,13 @@
     #define WVJB_WEBVIEW_DELEGATE_TYPE NSObject<UIWebViewDelegate>
 #endif
 
-@protocol WebViewJavascriptBridgeDelegate<NSObject>
-
-@optional
-
-// define a method，make the user decide every request from webview should be load except the WVJB request
--(BOOL) WVJB_webView:(UIWebView *)webView
-shouldStartLoadWithRequest:(NSURLRequest *)request
-      navigationType:(UIWebViewNavigationType)navigationType;
-
-
-@end
-
 typedef void (^WVJBResponseCallback)(id responseData);
 typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);
 
 @interface WebViewJavascriptBridge : WVJB_WEBVIEW_DELEGATE_TYPE
 
-@property (nonatomic,weak) id <WebViewJavascriptBridgeDelegate> delegate;
-
 + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView handler:(WVJBHandler)handler;
 + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WVJB_WEBVIEW_DELEGATE_TYPE*)webViewDelegate handler:(WVJBHandler)handler;
-+ (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView WVJBDelegate:(id)delegate handler:(WVJBHandler)handler;
 + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WVJB_WEBVIEW_DELEGATE_TYPE*)webViewDelegate handler:(WVJBHandler)handler resourceBundle:(NSBundle*)bundle;
 + (void)enableLogging;
 

diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -52,15 +52,6 @@ + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WV
     WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
     [bridge _platformSpecificSetup:webView webViewDelegate:webViewDelegate handler:messageHandler resourceBundle:bundle];
     [bridge reset];
-    bridge.delegate = nil;
-    return bridge;
-}
-
-+ (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView WVJBDelegate:(id)delegate handler:(WVJBHandler)handler {
-    WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
-    [bridge _platformSpecificSetup:webView webViewDelegate:nil handler:handler];
-    [bridge reset];
-    bridge.delegate = delegate;
     return bridge;
 }
 
@@ -396,17 +387,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
     } else if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:shouldStartLoadWithRequest:navigationType:)]) {
         return [strongDelegate webView:webView shouldStartLoadWithRequest:request navigationType:navigationType];
     } else {
-        if(self.delegate){
-            if([self.delegate respondsToSelector:@selector(WVJB_webView:shouldStartLoadWithRequest:navigationType:)]){
-                return [self.delegate WVJB_webView:webView
-                 shouldStartLoadWithRequest:request
-                             navigationType:navigationType];
-            }else{
-                return YES;
-            }
-        }else{
-            return YES;
-        }
+        return YES;
     }
 }