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

CB-5595 Rename "toolbarbarpostion" -> "toolbarposition"

Browse Source
This commit is contained in:
Andrew Grieve 2013-12-13 09:14:50 -05:00
parent 4aeaf81e1e
commit 25d152b578
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ios/CDVInAppBrowser.h
View File

@ -43,7 +43,7 @@
@property (nonatomic, assign) BOOL location; @property (nonatomic, assign) BOOL location;
@property (nonatomic, assign) BOOL toolbar; @property (nonatomic, assign) BOOL toolbar;
@property (nonatomic, copy) NSString* closebuttoncaption; @property (nonatomic, copy) NSString* closebuttoncaption;
@property (nonatomic, copy) NSString* toolbarbarposition; @property (nonatomic, copy) NSString* toolbarposition;
@property (nonatomic, copy) NSString* presentationstyle; @property (nonatomic, copy) NSString* presentationstyle;
@property (nonatomic, copy) NSString* transitionstyle; @property (nonatomic, copy) NSString* transitionstyle;

8
src/ios/CDVInAppBrowser.m
View File

@ -123,7 +123,7 @@
_previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle; _previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[self.inAppBrowserViewController showLocationBar:browserOptions.location]; [self.inAppBrowserViewController showLocationBar:browserOptions.location];
[self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarbarposition]; [self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarposition];
if (browserOptions.closebuttoncaption != nil) { if (browserOptions.closebuttoncaption != nil) {
[self.inAppBrowserViewController setCloseButtonTitle:browserOptions.closebuttoncaption]; [self.inAppBrowserViewController setCloseButtonTitle:browserOptions.closebuttoncaption];
} }
@ -412,7 +412,7 @@
// We create the views in code for primarily for ease of upgrades and not requiring an external .xib to be included // We create the views in code for primarily for ease of upgrades and not requiring an external .xib to be included
CGRect webViewBounds = self.view.bounds; CGRect webViewBounds = self.view.bounds;
BOOL toolbarIsAtBottom = ![_browserOptions.toolbarbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop]; BOOL toolbarIsAtBottom = ![_browserOptions.toolbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop];
webViewBounds.size.height -= _browserOptions.location ? FOOTER_HEIGHT : TOOLBAR_HEIGHT; webViewBounds.size.height -= _browserOptions.location ? FOOTER_HEIGHT : TOOLBAR_HEIGHT;
self.webView = [[UIWebView alloc] initWithFrame:webViewBounds]; self.webView = [[UIWebView alloc] initWithFrame:webViewBounds];
@ -731,7 +731,7 @@
} }
- (void) rePositionViews { - (void) rePositionViews {
if ([_browserOptions.toolbarbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop]) { if ([_browserOptions.toolbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop]) {
[self.webView setFrame:CGRectMake(self.webView.frame.origin.x, TOOLBAR_HEIGHT, self.webView.frame.size.width, self.webView.frame.size.height)]; [self.webView setFrame:CGRectMake(self.webView.frame.origin.x, TOOLBAR_HEIGHT, self.webView.frame.size.width, self.webView.frame.size.height)];
[self.toolbar setFrame:CGRectMake(self.toolbar.frame.origin.x, [self getStatusBarOffset], self.toolbar.frame.size.width, self.toolbar.frame.size.height)]; [self.toolbar setFrame:CGRectMake(self.toolbar.frame.origin.x, [self getStatusBarOffset], self.toolbar.frame.size.width, self.toolbar.frame.size.height)];
} }
@ -844,7 +844,7 @@
self.location = YES; self.location = YES;
self.toolbar = YES; self.toolbar = YES;
self.closebuttoncaption = nil; self.closebuttoncaption = nil;
self.toolbarbarposition = kInAppBrowserToolbarBarPositionBottom; self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
self.enableviewportscale = NO; self.enableviewportscale = NO;
self.mediaplaybackrequiresuseraction = NO; self.mediaplaybackrequiresuseraction = NO;