incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: Change useBrowserHistory to default to true (actually)
Date Tue, 23 Oct 2012 17:16:25 GMT
Updated Branches:
  refs/heads/master 0aa98ac2d -> 6a1e089b7


Change useBrowserHistory to default to true (actually)

Also logs a deprecation mession on start-up when it is set to false.
Fixes issue: https://issues.apache.org/jira/browse/CB-1611


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/6a1e089b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/6a1e089b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/6a1e089b

Branch: refs/heads/master
Commit: 6a1e089b73c90becfd131417424aa3076e51d368
Parents: 0aa98ac
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Oct 23 13:15:44 2012 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Oct 23 13:15:44 2012 -0400

----------------------------------------------------------------------
 .../src/org/apache/cordova/CordovaWebView.java     |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/6a1e089b/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 52ae6a9..e55d544 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -731,11 +731,10 @@ public class CordovaWebView extends WebView {
         }
 
         // Init preferences
-        if ("false".equals(this.getProperty("useBrowserHistory", "false"))) {
-            this.useBrowserHistory = false;
-        }
-        else {
-            this.useBrowserHistory = true;
+        this.useBrowserHistory = !"false".equals(this.getProperty("useBrowserHistory", "true"));
+        if (!this.useBrowserHistory) {
+            // Deprecated in Cordova 2.2.0.
+            Log.w(TAG, "useBrowserHistory=false is deprecated. Use history.back() instead
of navigator.app.backHistory().");
         }
 
         if ("true".equals(this.getProperty("fullscreen", "false"))) {


Mime
View raw message