You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2013/03/10 15:33:52 UTC
android commit: CB-2459: Customize InAppBrowser location bar
Updated Branches:
refs/heads/master ce1a961b9 -> e0d0d6c45
CB-2459: Customize InAppBrowser location bar
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e0d0d6c4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e0d0d6c4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e0d0d6c4
Branch: refs/heads/master
Commit: e0d0d6c455f77199afa08381b13f0ca11210579f
Parents: ce1a961
Author: Simon MacDonald <si...@gmail.com>
Authored: Sun Mar 10 10:33:42 2013 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Sun Mar 10 10:33:42 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/InAppBrowser.java | 17 +++++++++++---
1 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e0d0d6c4/framework/src/org/apache/cordova/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/InAppBrowser.java b/framework/src/org/apache/cordova/InAppBrowser.java
index 04a4e95..4f3095d 100644
--- a/framework/src/org/apache/cordova/InAppBrowser.java
+++ b/framework/src/org/apache/cordova/InAppBrowser.java
@@ -72,6 +72,7 @@ public class InAppBrowser extends CordovaPlugin {
private static final String EXIT_EVENT = "exit";
private static final String LOAD_START_EVENT = "loadstart";
private static final String LOAD_STOP_EVENT = "loadstop";
+ private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
private long MAX_QUOTA = 100 * 1024 * 1024;
private Dialog dialog;
@@ -79,6 +80,7 @@ public class InAppBrowser extends CordovaPlugin {
private EditText edittext;
private boolean showLocationBar = true;
private CallbackContext callbackContext;
+ private String buttonLabel = "Done";
/**
* Executes the request and returns PluginResult.
@@ -177,8 +179,12 @@ public class InAppBrowser extends CordovaPlugin {
option = new StringTokenizer(features.nextToken(), "=");
if (option.hasMoreElements()) {
String key = option.nextToken();
- Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE;
- map.put(key, value);
+ if (key.equalsIgnoreCase(CLOSE_BUTTON_CAPTION)) {
+ this.buttonLabel = option.nextToken();
+ } else {
+ Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE;
+ map.put(key, value);
+ }
}
}
return map;
@@ -292,7 +298,10 @@ public class InAppBrowser extends CordovaPlugin {
// Determine if we should hide the location bar.
showLocationBar = true;
if (features != null) {
- showLocationBar = features.get(LOCATION).booleanValue();
+ Boolean show = features.get(LOCATION);
+ if (show != null) {
+ showLocationBar = show.booleanValue();
+ }
}
final CordovaWebView thatWebView = this.webView;
@@ -408,7 +417,7 @@ public class InAppBrowser extends CordovaPlugin {
close.setLayoutParams(closeLayoutParams);
forward.setContentDescription("Close Button");
close.setId(5);
- close.setText("Done");
+ close.setText(buttonLabel);
close.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
closeDialog();