You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/01/02 19:08:34 UTC
[07/14] git commit: CB-5595 Rename "toolbarbarpostion" ->
"toolbarposition"
CB-5595 Rename "toolbarbarpostion" -> "toolbarposition"
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/25d152b5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/25d152b5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/25d152b5
Branch: refs/heads/master
Commit: 25d152b578a4fcca0ff8cb38d375b09f4fcb9ae9
Parents: 4aeaf81
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Dec 13 09:14:50 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Dec 13 09:17:49 2013 -0500
----------------------------------------------------------------------
src/ios/CDVInAppBrowser.h | 2 +-
src/ios/CDVInAppBrowser.m | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/25d152b5/src/ios/CDVInAppBrowser.h
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.h b/src/ios/CDVInAppBrowser.h
index b506b1f..885d522 100644
--- a/src/ios/CDVInAppBrowser.h
+++ b/src/ios/CDVInAppBrowser.h
@@ -43,7 +43,7 @@
@property (nonatomic, assign) BOOL location;
@property (nonatomic, assign) BOOL toolbar;
@property (nonatomic, copy) NSString* closebuttoncaption;
-@property (nonatomic, copy) NSString* toolbarbarposition;
+@property (nonatomic, copy) NSString* toolbarposition;
@property (nonatomic, copy) NSString* presentationstyle;
@property (nonatomic, copy) NSString* transitionstyle;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/25d152b5/src/ios/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index 153ba58..8b8f46b 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -123,7 +123,7 @@
_previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[self.inAppBrowserViewController showLocationBar:browserOptions.location];
- [self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarbarposition];
+ [self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarposition];
if (browserOptions.closebuttoncaption != nil) {
[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
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;
self.webView = [[UIWebView alloc] initWithFrame:webViewBounds];
@@ -731,7 +731,7 @@
}
- (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.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.toolbar = YES;
self.closebuttoncaption = nil;
- self.toolbarbarposition = kInAppBrowserToolbarBarPositionBottom;
+ self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
self.enableviewportscale = NO;
self.mediaplaybackrequiresuseraction = NO;