Skip to content
Permalink
Browse files
Merge pull request #254 from NiklasMerz/loading-spinner
CB-13659 (iOS) Add hidespinner option
  • Loading branch information
stevengill committed Apr 12, 2018
2 parents 50db5c4 + 695e1b0 commit 974ca3309a176c298bf421b658b4f2b0faeac42b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
@@ -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`).
- __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:

@@ -57,6 +57,7 @@
@property (nonatomic, copy) NSString* navigationbuttoncolor;
@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;
@@ -917,7 +917,10 @@ - (void)webViewDidStartLoad:(UIWebView*)theWebView
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];
}
@@ -1017,6 +1020,7 @@ - (id)init
self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
self.clearcache = NO;
self.clearsessioncache = NO;
self.hidespinner = NO;

self.enableviewportscale = NO;
self.mediaplaybackrequiresuseraction = NO;

0 comments on commit 974ca33

Please sign in to comment.