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

CB-13659 (iOS) Add hidespinner option

Browse Source 
Signed-off-by: Niklas Merz <NiklasMerz@gmx.net>
This commit is contained in:
Niklas Merz 2017-12-13 22:17:45 +01:00
parent 0f2f14a563
commit 695e1b0f02
No known key found for this signature in database
GPG Key ID: 9D0402820FB84764
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -101,8 +101,8 @@ instance, or the system browser.
- __options__: Options for the `InAppBrowser`. Optional, defaulting to: `location=yes`. _(String)_ - __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: All platforms support:
- __location__: Set to `yes` or `no` to turn the `InAppBrowser`'s location bar on or off. - __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`). - __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`). - __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. - __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: Windows supports these additional options:

6
src/ios/CDVInAppBrowser.h
View File

@ -52,6 +52,7 @@
@property (nonatomic, copy) NSString* toolbarposition; @property (nonatomic, copy) NSString* toolbarposition;
@property (nonatomic, assign) BOOL clearcache; @property (nonatomic, assign) BOOL clearcache;
@property (nonatomic, assign) BOOL clearsessioncache; @property (nonatomic, assign) BOOL clearsessioncache;
@property (nonatomic, assign) BOOL hidespinner;
@property (nonatomic, copy) NSString* presentationstyle; @property (nonatomic, copy) NSString* presentationstyle;
@property (nonatomic, copy) NSString* transitionstyle; @property (nonatomic, copy) NSString* transitionstyle;
@ -74,13 +75,13 @@
NSString* _prevUserAgent; NSString* _prevUserAgent;
NSInteger _userAgentLockToken; NSInteger _userAgentLockToken;
CDVInAppBrowserOptions *_browserOptions; CDVInAppBrowserOptions *_browserOptions;
#ifdef __CORDOVA_4_0_0 #ifdef __CORDOVA_4_0_0
CDVUIWebViewDelegate* _webViewDelegate; CDVUIWebViewDelegate* _webViewDelegate;
#else #else
CDVWebViewDelegate* _webViewDelegate; CDVWebViewDelegate* _webViewDelegate;
#endif #endif
} }
@property (nonatomic, strong) IBOutlet UIWebView* webView; @property (nonatomic, strong) IBOutlet UIWebView* webView;
@ -110,4 +111,3 @@
@property (nonatomic, weak) id <CDVScreenOrientationDelegate> orientationDelegate; @property (nonatomic, weak) id <CDVScreenOrientationDelegate> orientationDelegate;
@end @end

7
src/ios/CDVInAppBrowser.m
View File

@ -887,7 +887,10 @@
self.backButton.enabled = theWebView.canGoBack; self.backButton.enabled = theWebView.canGoBack;
self.forwardButton.enabled = theWebView.canGoForward; self.forwardButton.enabled = theWebView.canGoForward;
[self.spinner startAnimating]; NSLog(_browserOptions.hidespinner ? @"Yes" : @"No");
if(!_browserOptions.hidespinner) {
[self.spinner startAnimating];
}
return [self.navigationDelegate webViewDidStartLoad:theWebView]; return [self.navigationDelegate webViewDidStartLoad:theWebView];
} }
@ -987,6 +990,7 @@
self.toolbarposition = kInAppBrowserToolbarBarPositionBottom; self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
self.clearcache = NO; self.clearcache = NO;
self.clearsessioncache = NO; self.clearsessioncache = NO;
self.hidespinner = NO;
self.enableviewportscale = NO; self.enableviewportscale = NO;
self.mediaplaybackrequiresuseraction = NO; self.mediaplaybackrequiresuseraction = NO;
@ -1104,4 +1108,3 @@
@end @end