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 2012/02/20 22:01:00 UTC
[16/21] android commit: changing JS invoked from native to work with
modular js
changing JS invoked from native to work with modular js
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/8a137395
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/8a137395
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/8a137395
Branch: refs/heads/master
Commit: 8a137395ae868c6a34e60976c1b984b0a875e005
Parents: 390fe53
Author: Fil Maj <fi...@nitobi.com>
Authored: Wed Jan 25 14:28:47 2012 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Feb 20 11:04:35 2012 -0800
----------------------------------------------------------------------
.../org/apache/cordova/CordovaWebViewClient.java | 2 +-
framework/src/org/apache/cordova/DroidGap.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/8a137395/framework/src/org/apache/cordova/CordovaWebViewClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 4946cc4..319a944 100755
--- a/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -218,7 +218,7 @@ public class CordovaWebViewClient extends WebViewClient {
// not loaded yet then just set a flag so that the onNativeReady can be fired
// from the JS side when the JS gets to that code.
if (!url.equals("about:blank")) {
- ctx.appView.loadUrl("javascript:try{ Cordova.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+ ctx.appView.loadUrl("javascript:try{ require('cordova/channel').onNativeReady.fire();}catch(e){_nativeReady = true;}");
}
// Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/8a137395/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 85329b8..acfb046 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -849,7 +849,7 @@ public class DroidGap extends Activity implements CordovaInterface {
}
// Send pause event to JavaScript
- this.appView.loadUrl("javascript:try{Cordova.fireDocumentEvent('pause');}catch(e){};");
+ this.appView.loadUrl("javascript:try{require('cordova/channel').onPause.fire();}catch(e){console.log('exception firing pause event from native');};");
// Forward to plugins
this.pluginManager.onPause(this.keepRunning);
@@ -890,7 +890,7 @@ public class DroidGap extends Activity implements CordovaInterface {
}
// Send resume event to JavaScript
- this.appView.loadUrl("javascript:try{Cordova.fireDocumentEvent('resume');}catch(e){};");
+ this.appView.loadUrl("javascript:try{require('cordova/channel').onResume.fire();}catch(e){console.log('exception firing resume event from native');};");
// Forward to plugins
this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
@@ -920,7 +920,7 @@ public class DroidGap extends Activity implements CordovaInterface {
// Send destroy event to JavaScript
- this.appView.loadUrl("javascript:try{Cordova.onDestroy.fire();}catch(e){};");
+ this.appView.loadUrl("javascript:try{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.appView.loadUrl("about:blank");
@@ -1082,7 +1082,7 @@ public class DroidGap extends Activity implements CordovaInterface {
// If back key is bound, then send event to JavaScript
if (this.bound) {
- this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('backbutton');");
+ this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('backbutton');");
return true;
}
@@ -1104,13 +1104,13 @@ public class DroidGap extends Activity implements CordovaInterface {
// If menu key
else if (keyCode == KeyEvent.KEYCODE_MENU) {
- this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('menubutton');");
+ this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('menubutton');");
return super.onKeyDown(keyCode, event);
}
// If search key
else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
- this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('searchbutton');");
+ this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('searchbutton');");
return true;
}