cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [2/3] cordova-plugin-inappbrowser git commit: Merge branch 'master' of https://github.com/jellekralt/cordova-plugin-inappbrowser
Date Thu, 05 Mar 2015 01:49:58 GMT
Merge branch 'master' of https://github.com/jellekralt/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/b96c4a7d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/b96c4a7d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/b96c4a7d

Branch: refs/heads/master
Commit: b96c4a7d9af70ddda5121317b029d9829aac2cd9
Parents: a45dbc8 7201237
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Mar 4 17:42:43 2015 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Mar 4 17:42:43 2015 -0800

----------------------------------------------------------------------
 src/amazon/InAppBrowser.java  | 18 +++++++++++++++++-
 src/android/InAppBrowser.java | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/b96c4a7d/src/amazon/InAppBrowser.java
----------------------------------------------------------------------
diff --cc src/amazon/InAppBrowser.java
index cdcf49e,5c6ed76..0263ea2
--- a/src/amazon/InAppBrowser.java
+++ b/src/amazon/InAppBrowser.java
@@@ -89,7 -91,9 +90,8 @@@ public class InAppBrowser extends Cordo
      private EditText edittext;
      private CallbackContext callbackContext;
      private boolean showLocationBar = true;
+     private boolean showZoomControls = true;
      private boolean openWindowHidden = false;
 -    private String buttonLabel = "Done";
      private boolean clearAllCache= false;
      private boolean clearSessionCache=false;
  

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/b96c4a7d/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --cc src/android/InAppBrowser.java
index f90bdc7,2f07db0..217e48e
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@@ -88,10 -85,11 +89,11 @@@ public class InAppBrowser extends Cordo
      private EditText edittext;
      private CallbackContext callbackContext;
      private boolean showLocationBar = true;
+     private boolean showZoomControls = true;
      private boolean openWindowHidden = false;
 -    private String buttonLabel = "Done";
      private boolean clearAllCache= false;
      private boolean clearSessionCache=false;
 +    private boolean hadwareBackButton=true;
  
      /**
       * 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


Mime
View raw message