Merge pull request #401 from GEDYSIntraWare/bridge

dpa99c · web-flow · commit 80feff6cf8e3 · 2019-09-24T16:21:19.000+01:00
Move bridge creation to injectDeferredObject
diff --git a/src/ios/CDVUIInAppBrowser.m b/src/ios/CDVUIInAppBrowser.m
@@ -363,6 +363,7 @@ -(void)createIframeBridge
 
 - (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
 {
+    [self createIframeBridge];
     if (jsWrapper != nil) {
         NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
         NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
@@ -565,7 +566,6 @@ - (void)webViewDidStartLoad:(UIWebView*)theWebView
 
 - (void)webViewDidFinishLoad:(UIWebView*)theWebView
 {
-    [self createIframeBridge];
     if (self.callbackId != nil) {
         // TODO: It would be more useful to return the URL the page is actually on (e.g. if it's been redirected).
         NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];

Original file line number	Diff line number	Diff line change
`@@ -363,6 +363,7 @@ -(void)createIframeBridge`
`363`	`363`
`364`	`364`	`- (void)injectDeferredObject:(NSString)source withWrapper:(NSString)jsWrapper`
`365`	`365`	`{`
	`366`	`+ [self createIframeBridge];`
`366`	`367`	`if (jsWrapper != nil) {`
`367`	`368`	`NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];`
`368`	`369`	`NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];`
`@@ -565,7 +566,6 @@ - (void)webViewDidStartLoad:(UIWebView*)theWebView`
`565`	`566`
`566`	`567`	`- (void)webViewDidFinishLoad:(UIWebView*)theWebView`
`567`	`568`	`{`
`568`		`- [self createIframeBridge];`
`569`	`569`	`if (self.callbackId != nil) {`
`570`	`570`	`// TODO: It would be more useful to return the URL the page is actually on (e.g. if it's been redirected).`
`571`	`571`	`NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];`