Merge branch 'master' into CB-7179

2018-10-09 11:15:23 +01:00
parent 7f5fa2a28f d9cafcdb14
commit 19c6dfe197
6 changed files with 134 additions and 20 deletions
@@ -33,6 +33,10 @@

@interface CDVUIInAppBrowser : CDVPlugin {
  UIWindow * tmpWindow;
+
+  @private
+  BOOL _useBeforeload;
+  BOOL _waitForBeforeload;
 }

@property (nonatomic, retain) CDVUIInAppBrowserViewController* inAppBrowserViewController;
@@ -45,6 +49,7 @@
 - (void)injectScriptCode:(CDVInvokedUrlCommand*)command;
 - (void)show:(CDVInvokedUrlCommand*)command;
 - (void)hide:(CDVInvokedUrlCommand*)command;
+- (void)loadAfterBeforeload:(CDVInvokedUrlCommand*)command;

@end