Merge pull request #8523 from hansemannn/TIMOB-10488

[TIMOB-10488] iOS: Fix webview loading default value
tidev · Oct 24, 2016 · 779b3c6 · 779b3c6
2 parents 0377d18 + 55766e6
commit 779b3c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/iphone/Classes/TiUIWebView.h b/iphone/Classes/TiUIWebView.h
@@ -41,7 +41,7 @@
 -(void)stopLoading;
 -(void)goBack;
 -(void)goForward;
--(BOOL)isLoading;
+-(BOOL)loading;
 -(BOOL)canGoBack;
 -(BOOL)canGoForward;
 -(void)reload;

diff --git a/iphone/Classes/TiUIWebView.m b/iphone/Classes/TiUIWebView.m
@@ -370,7 +370,7 @@ - (void)goForward
 	[webview goForward];
 }
 
--(BOOL)isLoading
+-(BOOL)loading
 {
 	return [webview isLoading];
 }

diff --git a/iphone/Classes/TiUIWebViewProxy.m b/iphone/Classes/TiUIWebViewProxy.m
@@ -104,6 +104,16 @@ - (NSString*)html
 	return html;
 }
 
+-(id)loading
+{
+	__block BOOL loading;
+	TiThreadPerformOnMainThread(^{
+		loading = [(TiUIWebView*)[self view] loading];
+	}, YES);
+
+	return NUMBOOL(loading);
+}
+
 -(void)goBack:(id)args
 {
 	TiThreadPerformOnMainThread(^{[(TiUIWebView*)[self view] goBack];}, NO);
@@ -299,4 +309,4 @@ -(void)webviewDidFinishLoad
 }
 @end
 
-#endif
+#endif