You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2018/11/19 17:28:30 UTC
[cordova-plugin-inappbrowser] branch master updated: Fix iOS
CDVWKInAppBrowser evaluateJavascript method randomly gets blocked on ios 12
(#341)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-inappbrowser.git
The following commit(s) were added to refs/heads/master by this push:
new 978b147 Fix iOS CDVWKInAppBrowser evaluateJavascript method randomly gets blocked on ios 12 (#341)
978b147 is described below
commit 978b14759824a024b85e6f7a10c97418a11eab34
Author: Jonathan Li <jo...@yahoo.ca>
AuthorDate: Mon Nov 19 12:28:25 2018 -0500
Fix iOS CDVWKInAppBrowser evaluateJavascript method randomly gets blocked on ios 12 (#341)
### Platforms affected
iOS
### What does this PR do?
fix issue[ #340](https://github.com/apache/cordova-plugin-inappbrowser/issues/340) iOS CDVWKInAppBrowser evaluateJavascript method randomly gets blocked on iOS 12
### What testing has been done on this change?
manual testing
### Checklist
- [x] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
- [x] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
- [ ] Added automated test coverage as appropriate for this change.
---
src/ios/CDVWKInAppBrowser.m | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m
index 9b515dd..a952114 100644
--- a/src/ios/CDVWKInAppBrowser.m
+++ b/src/ios/CDVWKInAppBrowser.m
@@ -399,30 +399,17 @@ static CDVWKInAppBrowser* instance = nil;
//Synchronus helper for javascript evaluation
-
-- (NSString *)evaluateJavaScript:(NSString *)script {
- __block NSString *resultString = nil;
- __block BOOL finished = NO;
+- (void)evaluateJavaScript:(NSString *)script {
__block NSString* _script = script;
-
[self.inAppBrowserViewController.webView evaluateJavaScript:script completionHandler:^(id result, NSError *error) {
if (error == nil) {
if (result != nil) {
- resultString = result;
- NSLog(@"%@", resultString);
+ NSLog(@"%@", result);
}
} else {
NSLog(@"evaluateJavaScript error : %@ : %@", error.localizedDescription, _script);
}
- finished = YES;
}];
-
- while (!finished)
- {
- [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
- }
-
- return resultString;
}
- (void)injectScriptCode:(CDVInvokedUrlCommand*)command
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org