Merge branch 'master' into v2ex

AlexRezit · AlexRezit · commit 14e055987f5c · 2013-06-06T11:25:40.000+08:00
diff --git a/WebAppWrapper/RootViewController.m b/WebAppWrapper/RootViewController.m
@@ -76,8 +76,8 @@ - (void)refresh
 - (void)failRefresh
 {
     if (self.currentFailRefreshCount) {
-        [self refresh];
         self.currentFailRefreshCount--;
+        [self refresh];
     } else {
         [self showFailLoadWarning];
     }
@@ -264,7 +264,9 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
 {
     if (webView == self.webView) {
-        [self failRefresh];
+        if (error.code != NSURLErrorCancelled) {
+            [self failRefresh];
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ - (void)refresh`
`76`	`76`	`- (void)failRefresh`
`77`	`77`	`{`
`78`	`78`	`if (self.currentFailRefreshCount) {`
`79`		`- [self refresh];`
`80`	`79`	`self.currentFailRefreshCount--;`
	`80`	`+ [self refresh];`
`81`	`81`	`} else {`
`82`	`82`	`[self showFailLoadWarning];`
`83`	`83`	`}`
`@@ -264,7 +264,9 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView`
`264`	`264`	`- (void)webView:(UIWebView )webView didFailLoadWithError:(NSError )error`
`265`	`265`	`{`
`266`	`266`	`if (webView == self.webView) {`
`267`		`- [self failRefresh];`
	`267`	`+ if (error.code != NSURLErrorCancelled) {`
	`268`	`+ [self failRefresh];`
	`269`	`+ }`
`268`	`270`	`}`
`269`	`271`	`}`
`270`	`272`