watch webKit error 101

kmonde89 · kmonde89 · commit 51c35ec261d0 · 2015-08-21T16:59:08.000+02:00
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -19,6 +19,9 @@ @implementation WebViewJavascriptBridge {
     WVJB_WEAK id _webViewDelegate;
     long _uniqueId;
     WebViewJavascriptBridgeBase *_base;
+#if defined WVJB_PLATFORM_IOS
+	NSUInteger _numRequestsLoading;
+#endif
 }
 
 /* API
@@ -183,9 +186,9 @@ - (void) _platformSpecificDealloc {
 
 - (void)webViewDidFinishLoad:(UIWebView *)webView {
     if (webView != _webView) { return; }
-	
+	_numRequestsLoading--;
     
-    if ( ![[webView stringByEvaluatingJavaScriptFromString:[_base webViewJavascriptCheckCommand]] isEqualToString:@"true"]) {
+    if ( _numRequestsLoading <= 0 && ![[webView stringByEvaluatingJavaScriptFromString:[_base webViewJavascriptCheckCommand]] isEqualToString:@"true"]) {
         [_base injectJavascriptFile:YES];
     }
     [_base dispatchStartUpMessageQueue];
@@ -200,7 +203,8 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView {
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     if (webView != _webView) { return; }
 	
-    
+	_numRequestsLoading--;
+    //watch error code 101
     __strong WVJB_WEBVIEW_DELEGATE_TYPE* strongDelegate = _webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
         [strongDelegate webView:webView didFailLoadWithError:error];
@@ -228,7 +232,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
 
 - (void)webViewDidStartLoad:(UIWebView *)webView {
     if (webView != _webView) { return; }
-	
+	_numRequestsLoading++;
     
     __strong WVJB_WEBVIEW_DELEGATE_TYPE* strongDelegate = _webViewDelegate;
     if (strongDelegate && [strongDelegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -12,6 +12,7 @@ @implementation WebViewJavascriptBridgeBase {
     id _webViewDelegate;
     long _uniqueId;
     NSBundle *_resourceBundle;
+	
 }
 
 static bool logging = false;

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ @implementation WebViewJavascriptBridgeBase {`
`12`	`12`	`id _webViewDelegate;`
`13`	`13`	`long _uniqueId;`
`14`	`14`	`NSBundle *_resourceBundle;`
	`15`	`+`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`static bool logging = false;`