Merge pull request #254 from NiklasMerz/loading-spinner
CB-13659 (iOS) Add hidespinner option
This commit is contained in:
commit
974ca3309a
@ -150,6 +150,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:
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@
|
|||||||
@property (nonatomic, copy) NSString* navigationbuttoncolor;
|
@property (nonatomic, copy) NSString* navigationbuttoncolor;
|
||||||
@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;
|
||||||
|
@ -917,7 +917,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];
|
||||||
}
|
}
|
||||||
@ -1017,6 +1020,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user