(ios) Move createIframeBridge to injectDeferredObject

NiklasMerz · NiklasMerz · commit e3db974080ab · 2019-01-16T14:22:51.000+01:00
Avoid failed script injections for pages which did not finish loading.
diff --git a/src/ios/CDVUIInAppBrowser.m b/src/ios/CDVUIInAppBrowser.m
@@ -362,6 +362,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];
@@ -564,7 +565,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
`@@ -362,6 +362,7 @@ -(void)createIframeBridge`
`362`	`362`
`363`	`363`	`- (void)injectDeferredObject:(NSString)source withWrapper:(NSString)jsWrapper`
`364`	`364`	`{`
	`365`	`+ [self createIframeBridge];`
`365`	`366`	`if (jsWrapper != nil) {`
`366`	`367`	`NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];`
`367`	`368`	`NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];`
`@@ -564,7 +565,6 @@ - (void)webViewDidStartLoad:(UIWebView*)theWebView`
`564`	`565`
`565`	`566`	`- (void)webViewDidFinishLoad:(UIWebView*)theWebView`
`566`	`567`	`{`
`567`		`- [self createIframeBridge];`
`568`	`568`	`if (self.callbackId != nil) {`
`569`	`569`	`// TODO: It would be more useful to return the URL the page is actually on (e.g. if it's been redirected).`
`570`	`570`	`NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];`