Merge branch 'heisenbug' of https://github.com/peyton/WebViewJavascriptBridge

marcuswestin · marcuswestin · commit 9f30d44b5eb1 · 2013-06-06T13:55:06.000-07:00
Conflicts:
	WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m
	WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.m
diff --git a/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m b/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m
@@ -1,5 +1,11 @@
 #import "WebViewJavascriptBridge_OSX.h"
 
+@interface WebViewJavascriptBridge ()
+
+@property (nonatomic, assign) NSUInteger numRequestsLoading;
+
+@end
+
 @implementation WebViewJavascriptBridge
 
 + (instancetype)bridgeForWebView:(WebView *)webView handler:(WVJBHandler)handler {
@@ -17,7 +23,7 @@ + (instancetype)bridgeForWebView:(WebView *)webView webViewDelegate:(id)webViewD
     bridge.webView.frameLoadDelegate = bridge;
     bridge.webView.resourceLoadDelegate = bridge;
     bridge.webView.policyDelegate = bridge;
-    
+        
     return bridge;
 }
 
@@ -32,7 +38,9 @@ - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
 {
     if (webView != self.webView) { return; }
     
-    if (![[webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
+    self.numRequestsLoading--;
+
+    if (self.numRequestsLoading == 0 && ![[webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
         NSString *filePath = [[NSBundle mainBundle] pathForResource:@"WebViewJavascriptBridge.js" ofType:@"txt"];
         NSString *js = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
         [webView stringByEvaluatingJavaScriptFromString:js];
@@ -53,6 +61,8 @@ - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
 
 - (void)webView:(WebView *)webView didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
     if (webView != self.webView) { return; }
+    self.numRequestsLoading--;
+
     __strong typeof(self.webViewDelegate) strongDelegate = self.webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) {
         [strongDelegate webView:strongDelegate didFailLoadWithError:error forFrame:frame];
@@ -89,6 +99,9 @@ - (void)webView:(WebView *)webView didCommitLoadForFrame:(WebFrame *)frame {
 
 - (NSURLRequest *)webView:(WebView *)webView resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
     if (webView != self.webView) { return request; }
+
+    self.numRequestsLoading++;
+
     __strong typeof(self.webViewDelegate) strongDelegate = self.webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)]) {
         return [strongDelegate webView:webView resource:identifier willSendRequest:request redirectResponse:redirectResponse fromDataSource:dataSource];
diff --git a/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.m b/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.m
@@ -1,5 +1,11 @@
 #import "WebViewJavascriptBridge_iOS.h"
 
+@interface WebViewJavascriptBridge ()
+
+@property (nonatomic, assign) NSUInteger numRequestsLoading;
+
+@end
+
 @implementation WebViewJavascriptBridge
 
 #pragma mark UIWebViewDelegate
@@ -9,15 +15,15 @@ + (instancetype)bridgeForWebView:(UIWebView *)webView handler:(WVJBHandler)handl
 }
 
 + (instancetype)bridgeForWebView:(UIWebView *)webView webViewDelegate:(id<UIWebViewDelegate>)webViewDelegate handler:(WVJBHandler)messageHandler {
-    WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
+    WebViewJavascriptBridge* bridge = [[[self class] alloc] init];
     bridge.messageHandler = messageHandler;
     bridge.webView = webView;
     bridge.webViewDelegate = webViewDelegate;
     bridge.messageHandlers = [NSMutableDictionary dictionary];
     [bridge reset];
     
     [webView setDelegate:bridge];
-    
+        
     return bridge;
 }
 
@@ -29,7 +35,9 @@ - (void)dealloc;
 - (void)webViewDidFinishLoad:(UIWebView *)webView {
     if (webView != self.webView) { return; }
     
-    if (![[webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
+    self.numRequestsLoading--;
+    
+    if (self.numRequestsLoading == 0 && ![[webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
         NSString *filePath = [[NSBundle mainBundle] pathForResource:@"WebViewJavascriptBridge.js" ofType:@"txt"];
         NSString *js = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
         [webView stringByEvaluatingJavaScriptFromString:js];
@@ -50,6 +58,9 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView {
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     if (webView != self.webView) { return; }
+
+    self.numRequestsLoading--;
+
     __strong typeof(self.webViewDelegate) strongDelegate = self.webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
         [strongDelegate webView:webView didFailLoadWithError:error];
@@ -76,6 +87,9 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
 
 - (void)webViewDidStartLoad:(UIWebView *)webView {
     if (webView != self.webView) { return; }
+
+    self.numRequestsLoading++;
+
     __strong typeof(self.webViewDelegate) strongDelegate = self.webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
         [strongDelegate webViewDidStartLoad:webView];
