fix conflicts

Author: Peyton Randolph

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,15 +23,17 @@ + (instancetype)bridgeForWebView:(WebView *)webView webViewDelegate:(id)webViewD
     bridge.webView.frameLoadDelegate = bridge;
     bridge.webView.resourceLoadDelegate = bridge;
     bridge.webView.policyDelegate = bridge;
-    
+        
     return bridge;
 }
 
 - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
 {
     if (webView != self.webView) { return; }
 
-    if (![[self.webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
+    self.numRequestsLoading--;
+
+    if (self.numRequestsLoading == 0 && ![[self.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];
         [self.webView stringByEvaluatingJavaScriptFromString:js];
@@ -45,6 +53,9 @@ - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
 
 - (void)webView:(WebView *)webView didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
     if (webView != self.webView) { return; }
+
+    self.numRequestsLoading--;
+
     if (self.webViewDelegate && [self.webViewDelegate respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) {
         [self.webViewDelegate webView:self.webView didFailLoadWithError:error forFrame:frame];
     }
@@ -78,6 +89,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++;
+
     if (self.webViewDelegate && [self.webViewDelegate respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)]) {
         return [self.webViewDelegate webView:webView resource:identifier willSendRequest:request redirectResponse:redirectResponse fromDataSource:dataSource];
     }

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,22 +15,24 @@ + (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;
 }
 
 - (void)webViewDidFinishLoad:(UIWebView *)webView {
     if (webView != self.webView) { return; }
 
-    if (![[self.webView stringByEvaluatingJavaScriptFromString:@"typeof WebViewJavascriptBridge == 'object'"] isEqualToString:@"true"]) {
+    self.numRequestsLoading--;
+    
+    if (self.numRequestsLoading == 0 && ![[self.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];
         [self.webView stringByEvaluatingJavaScriptFromString:js];
@@ -44,6 +52,7 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView {
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     if (webView != self.webView) { return; }
+    self.numRequestsLoading--;
     if (self.webViewDelegate && [self.webViewDelegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
         [self.webViewDelegate webView:self.webView didFailLoadWithError:error];
     }
@@ -68,6 +77,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
 
 - (void)webViewDidStartLoad:(UIWebView *)webView {
     if (webView != self.webView) { return; }
+    self.numRequestsLoading++;
     if (self.webViewDelegate && [self.webViewDelegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
         [self.webViewDelegate webViewDidStartLoad:webView];
     }