You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/06/12 18:34:14 UTC

[3/3] android commit: CB-3766: Javascript uses loadUrl, not loadUrlIntoView, which is only for documents

CB-3766: Javascript uses loadUrl, not loadUrlIntoView, which is only for documents


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

Branch: refs/heads/master
Commit: a021adb7fdafecb6deb5d37dd84596a23d1ede53
Parents: e2a090b
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jun 12 09:33:52 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jun 12 09:33:52 2013 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a021adb7/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 9796ed8..e1d1bf1 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -806,7 +806,7 @@ public class CordovaWebView extends WebView {
     {
         // Send destroy event to JavaScript
     	// Since baseUrl is set in loadUrlIntoView, if user hit Back button before loadUrl was called, we'll get an NPE on baseUrl (CB-2458)
-        this.loadUrlIntoView("javascript:try{cordova.require('cordova/channel').onDestroy.fire();}catch(e){console.log('exception firing destroy event from native');};");
+        this.loadUrl("javascript:try{cordova.require('cordova/channel').onDestroy.fire();}catch(e){console.log('exception firing destroy event from native');};");
 
         // Load blank page so that JavaScript onunload is called
         this.loadUrl("about:blank");