github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cordovaplugin_update

Browse Source
This commit is contained in:
Braden Shepherdson 2012-10-12 17:05:47 -04:00
commit 31f7f8149e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/org/apache/cordova/CordovaWebView.java
View File

@ -83,7 +83,7 @@ public class CordovaWebView extends WebView {
String baseUrl; String baseUrl;
private Stack<String> urls = new Stack<String>(); private Stack<String> urls = new Stack<String>();
boolean useBrowserHistory = false; boolean useBrowserHistory = true;
// Flag to track that a loadUrl timeout occurred // Flag to track that a loadUrl timeout occurred
int loadUrlTimeout = 0; int loadUrlTimeout = 0;
@ -722,11 +722,11 @@ public class CordovaWebView extends WebView {
} }
// Init preferences // Init preferences
if ("true".equals(this.getProperty("useBrowserHistory", "false"))) { if ("false".equals(this.getProperty("useBrowserHistory", "false"))) {
this.useBrowserHistory = true; this.useBrowserHistory = false;
} }
else { else {
this.useBrowserHistory = false; this.useBrowserHistory = true;
} }
if ("true".equals(this.getProperty("fullscreen", "false"))) { if ("true".equals(this.getProperty("fullscreen", "false"))) {