incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/3] android commit: Cleaning up code, because negating string comparisons is confusing if the string itself is called false. Also clarified the deprecation message to match the Cordova policy that we agreed on for deprecation changes
Date Tue, 23 Oct 2012 17:47:14 GMT
Updated Branches:
  refs/heads/master 6a1e089b7 -> 5f1cda07e


Cleaning up code, because negating string comparisons is confusing if the string itself is
called false.  Also clarified the deprecation message to match the Cordova policy that we
agreed on for deprecation changes


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/5f1cda07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5f1cda07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5f1cda07

Branch: refs/heads/master
Commit: 5f1cda07e707b39cff1c06e7635d25a11b502eb1
Parents: e11bead
Author: Joe Bowser <bowserj@apache.org>
Authored: Tue Oct 23 10:46:53 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Tue Oct 23 10:46:53 2012 -0700

----------------------------------------------------------------------
 .../src/org/apache/cordova/CordovaWebView.java     |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5f1cda07/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 e55d544..500ba52 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -730,13 +730,13 @@ public class CordovaWebView extends WebView {
             }
         }
 
-        // Init preferences
-        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("false".equals(this.getProperty("useBrowserHistory", "true")))
+        {
+            //Switch back to the old browser history and state the six month policy
+            this.useBrowserHistory = false;
+            Log.w(TAG, "useBrowserHistory=false is deprecated. We will be removing this feature
entirely in six months.  Please use the browser history and use history.back().");
         }
-
+ 
         if ("true".equals(this.getProperty("fullscreen", "false"))) {
             this.cordova.getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
             this.cordova.getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);


Mime
View raw message