Skip to content

remove numRequestsLoading #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kmonde89 wants to merge 3 commits into from
Closed

remove numRequestsLoading #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52d0e2d
remove _numRequestsLoading
kmonde89 Aug 20, 2015
51c35ec
watch webKit error 101
kmonde89 Aug 21, 2015
d59454e
possible overflow
kmonde89 Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions WebViewJavascriptBridge/WebViewJavascriptBridge.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*****/
Expand Down Expand Up @@ -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];
Expand All @@ -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];
Expand Down Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ @implementation WebViewJavascriptBridgeBase {
id _webViewDelegate;
long _uniqueId;
NSBundle *_resourceBundle;

}

static bool logging = false;
Expand Down