You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/12/10 23:47:45 UTC
cordova-plugin-inappbrowser git commit: CB-9445 Improves
executeScript callbacks on iOS
Repository: cordova-plugin-inappbrowser
Updated Branches:
refs/heads/master 290ea0ac9 -> 65821f907
CB-9445 Improves executeScript callbacks on iOS
This closes #125
Signed-off-by: Shazron Abdullah <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/65821f90
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/65821f90
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/65821f90
Branch: refs/heads/master
Commit: 65821f907d622528f80153ecd24630d483742a69
Parents: 290ea0a
Author: sgrebnov <v-...@microsoft.com>
Authored: Fri Nov 20 19:15:55 2015 +0300
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Dec 10 14:47:43 2015 -0800
----------------------------------------------------------------------
src/ios/CDVInAppBrowser.h | 1 -
src/ios/CDVInAppBrowser.m | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/65821f90/src/ios/CDVInAppBrowser.h
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.h b/src/ios/CDVInAppBrowser.h
index 1ccc7b1..6bb0ec1 100644
--- a/src/ios/CDVInAppBrowser.h
+++ b/src/ios/CDVInAppBrowser.h
@@ -30,7 +30,6 @@
@class CDVInAppBrowserViewController;
@interface CDVInAppBrowser : CDVPlugin {
- BOOL _injectedIframeBridge;
}
@property (nonatomic, retain) CDVInAppBrowserViewController* inAppBrowserViewController;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/65821f90/src/ios/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index 72effaa..986cfa9 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -266,11 +266,8 @@
- (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
{
- if (!_injectedIframeBridge) {
- _injectedIframeBridge = YES;
- // Create an iframe bridge in the new document to communicate with the CDVInAppBrowserViewController
- [self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:@"(function(d){var e = _cdvIframeBridge = d.createElement('iframe');e.style.display='none';d.body.appendChild(e);})(document)"];
- }
+ // Ensure an iframe bridge is created to communicate with the CDVInAppBrowserViewController
+ [self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:@"(function(d){_cdvIframeBridge=d.getElementById('_cdvIframeBridge');if(!_cdvIframeBridge) {var e = _cdvIframeBridge = d.createElement('iframe');e.id='_cdvIframeBridge'; e.style.display='none';d.body.appendChild(e);}})(document)"];
if (jsWrapper != nil) {
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
@@ -407,7 +404,6 @@
- (void)webViewDidStartLoad:(UIWebView*)theWebView
{
- _injectedIframeBridge = NO;
}
- (void)webViewDidFinishLoad:(UIWebView*)theWebView
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org