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

changing JS invoked from native to work with modular js

Browse Source
This commit is contained in:
Fil Maj 2012-01-25 14:28:47 -08:00 committed by Joe Bowser
parent 390fe537f8
commit 8a137395ae
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/org/apache/cordova/CordovaWebViewClient.java
View File

@ -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

12
framework/src/org/apache/cordova/DroidGap.java
View File

@ -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;
}