You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/03/04 09:35:18 UTC
[3/4] cordova-plugin-inappbrowser git commit: Merge branch 'master'
of https://github.com/kriserickson/cordova-plugin-inappbrowser
Merge branch 'master' of https://github.com/kriserickson/cordova-plugin-inappbrowser
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/9de15ac8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/9de15ac8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/9de15ac8
Branch: refs/heads/master
Commit: 9de15ac8bf6fc12bbda274bc42a39fb8223ab979
Parents: f4879e9 fea1f98
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Mar 4 00:13:29 2015 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Mar 4 00:13:29 2015 -0800
----------------------------------------------------------------------
src/android/InAppBrowser.java | 24 +++++++++++++++++++++++-
src/android/InAppBrowserDialog.java | 6 +++++-
2 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/9de15ac8/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --cc src/android/InAppBrowser.java
index 2cdb979,ab8c4fb..09bd55b
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@@ -79,8 -75,10 +79,9 @@@ public class InAppBrowser extends Cordo
private static final String LOAD_START_EVENT = "loadstart";
private static final String LOAD_STOP_EVENT = "loadstop";
private static final String LOAD_ERROR_EVENT = "loaderror";
- private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
private static final String CLEAR_ALL_CACHE = "clearcache";
private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
+ private static final String HARDWARE_BACK_BUTTON = "hardwareback";
private InAppBrowserDialog dialog;
private WebView inAppWebView;
@@@ -88,8 -86,10 +89,9 @@@
private CallbackContext callbackContext;
private boolean showLocationBar = true;
private boolean openWindowHidden = false;
- private String buttonLabel = "Done";
private boolean clearAllCache= false;
private boolean clearSessionCache=false;
+ private boolean hadwareBackButton=false;
/**
* Executes the request and returns PluginResult.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org