diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m index 2eb09e95..ce5284d1 100644 --- a/WebViewJavascriptBridge/WebViewJavascriptBridge.m +++ b/WebViewJavascriptBridge/WebViewJavascriptBridge.m @@ -18,12 +18,7 @@ @implementation WebViewJavascriptBridge { WVJB_WEAK WVJB_WEBVIEW_TYPE* _webView; WVJB_WEAK id _webViewDelegate; long _uniqueId; - WebViewJavascriptBridgeBase *_base; -#if defined WVJB_PLATFORM_IOS - NSUInteger _numRequestsLoading; -#endif - -} + WebViewJavascriptBridgeBase *_base;} /* API *****/ @@ -188,9 +183,7 @@ - (void) _platformSpecificDealloc { - (void)webViewDidFinishLoad:(UIWebView *)webView { if (webView != _webView) { return; } - _numRequestsLoading--; - - if (_numRequestsLoading == 0 && ![[webView stringByEvaluatingJavaScriptFromString:[_base webViewJavascriptCheckCommand]] isEqualToString:@"true"]) { + if (![[webView stringByEvaluatingJavaScriptFromString:[_base webViewJavascriptCheckCommand]] isEqualToString:@"true"]) { [_base injectJavascriptFile:YES]; } [_base dispatchStartUpMessageQueue]; @@ -204,9 +197,7 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView { - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error { if (webView != _webView) { return; } - - _numRequestsLoading--; - + __strong WVJB_WEBVIEW_DELEGATE_TYPE* strongDelegate = _webViewDelegate; if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) { [strongDelegate webView:webView didFailLoadWithError:error]; @@ -235,8 +226,6 @@ - (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:)]) { [strongDelegate webViewDidStartLoad:webView]; diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m index 3717eb7d..2e3f1456 100644 --- a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m +++ b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m @@ -12,6 +12,7 @@ @implementation WebViewJavascriptBridgeBase { id _webViewDelegate; long _uniqueId; NSBundle *_resourceBundle; + } static bool logging = false;