zhaidi/cordova-plugin-inappbrowser
zhaidi/cordova-plugin-inappbrowser
1
0
Fork 0
forked from public/cordova-plugin-inappbrowser
Code Pull Requests Activity

Merge pull request #401 from GEDYSIntraWare/bridge

Browse Source 
Move bridge creation to injectDeferredObject
This commit is contained in:
Dave Alden 2019-09-24 16:21:19 +01:00 committed by GitHub
commit 80feff6cf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ios/CDVUIInAppBrowser.m
View File

@ -363,6 +363,7 @@ static CDVUIInAppBrowser* instance = nil;
- (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper - (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
{ {
[self createIframeBridge];
if (jsWrapper != nil) { if (jsWrapper != nil) {
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil]; NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
@ -565,7 +566,6 @@ static CDVUIInAppBrowser* instance = nil;
- (void)webViewDidFinishLoad:(UIWebView*)theWebView - (void)webViewDidFinishLoad:(UIWebView*)theWebView
{ {
[self createIframeBridge];
if (self.callbackId != nil) { 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). // 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]; NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];