From 695e1b0f02d4d8a3ac454cffecb2a0100774abcd Mon Sep 17 00:00:00 2001 From: Niklas Merz Date: Wed, 13 Dec 2017 22:17:45 +0100 Subject: [PATCH] CB-13659 (iOS) Add hidespinner option Signed-off-by: Niklas Merz --- README.md | 5 +++-- src/ios/CDVInAppBrowser.h | 6 +++--- src/ios/CDVInAppBrowser.m | 7 +++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a4b7cd9..de4c8ee 100644 --- a/README.md +++ b/README.md @@ -101,8 +101,8 @@ instance, or the system browser. - __options__: Options for the `InAppBrowser`. Optional, defaulting to: `location=yes`. _(String)_ - The `options` string must not contain any blank space, and each feature's name/value pairs must be separated by a comma. Feature names are case insensitive. - + The `options` string must not contain any blank space, and each feature's name/value pairs must be separated by a comma. Feature names are case insensitive. + All platforms support: - __location__: Set to `yes` or `no` to turn the `InAppBrowser`'s location bar on or off. @@ -134,6 +134,7 @@ instance, or the system browser. - __presentationstyle__: Set to `pagesheet`, `formsheet` or `fullscreen` to set the [presentation style](http://developer.apple.com/library/ios/documentation/UIKit/Reference/UIViewController_Class/Reference/Reference.html#//apple_ref/occ/instp/UIViewController/modalPresentationStyle) (defaults to `fullscreen`). - __transitionstyle__: Set to `fliphorizontal`, `crossdissolve` or `coververtical` to set the [transition style](http://developer.apple.com/library/ios/#documentation/UIKit/Reference/UIViewController_Class/Reference/Reference.html#//apple_ref/occ/instp/UIViewController/modalTransitionStyle) (defaults to `coververtical`). - __toolbarposition__: Set to `top` or `bottom` (default is `bottom`). Causes the toolbar to be at the top or bottom of the window. + - __hidespinner__: Set to `yes` or `no` to change the visibility of the loading indicator (defaults to `no`). Windows supports these additional options: diff --git a/src/ios/CDVInAppBrowser.h b/src/ios/CDVInAppBrowser.h index d258eb0..0ad9bd5 100644 --- a/src/ios/CDVInAppBrowser.h +++ b/src/ios/CDVInAppBrowser.h @@ -52,6 +52,7 @@ @property (nonatomic, copy) NSString* toolbarposition; @property (nonatomic, assign) BOOL clearcache; @property (nonatomic, assign) BOOL clearsessioncache; +@property (nonatomic, assign) BOOL hidespinner; @property (nonatomic, copy) NSString* presentationstyle; @property (nonatomic, copy) NSString* transitionstyle; @@ -74,13 +75,13 @@ NSString* _prevUserAgent; NSInteger _userAgentLockToken; CDVInAppBrowserOptions *_browserOptions; - + #ifdef __CORDOVA_4_0_0 CDVUIWebViewDelegate* _webViewDelegate; #else CDVWebViewDelegate* _webViewDelegate; #endif - + } @property (nonatomic, strong) IBOutlet UIWebView* webView; @@ -110,4 +111,3 @@ @property (nonatomic, weak) id orientationDelegate; @end - diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m index f5d05f0..3daa86d 100644 --- a/src/ios/CDVInAppBrowser.m +++ b/src/ios/CDVInAppBrowser.m @@ -887,7 +887,10 @@ self.backButton.enabled = theWebView.canGoBack; self.forwardButton.enabled = theWebView.canGoForward; - [self.spinner startAnimating]; + NSLog(_browserOptions.hidespinner ? @"Yes" : @"No"); + if(!_browserOptions.hidespinner) { + [self.spinner startAnimating]; + } return [self.navigationDelegate webViewDidStartLoad:theWebView]; } @@ -987,6 +990,7 @@ self.toolbarposition = kInAppBrowserToolbarBarPositionBottom; self.clearcache = NO; self.clearsessioncache = NO; + self.hidespinner = NO; self.enableviewportscale = NO; self.mediaplaybackrequiresuseraction = NO; @@ -1104,4 +1108,3 @@ @end -