From 8a137395ae868c6a34e60976c1b984b0a875e005 Mon Sep 17 00:00:00 2001
From: Fil Maj <filip.maj@nitobi.com>
Date: Wed, 25 Jan 2012 14:28:47 -0800
Subject: [PATCH] changing JS invoked from native to work with modular js

---
 .../src/org/apache/cordova/CordovaWebViewClient.java |  2 +-
 framework/src/org/apache/cordova/DroidGap.java       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 4946cc423f..319a944b56 100755
--- a/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -218,7 +218,7 @@ public void onPageFinished(WebView view, String url) {
         // 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
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 85329b8bd2..acfb04691c 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -849,7 +849,7 @@ protected void onPause() {
         }
 
         // 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 @@ protected void onResume() {
         }
 
         // 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 void onDestroy() {
 
 
             // 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 boolean onKeyDown(int keyCode, KeyEvent event) {
 
             // 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 boolean onKeyDown(int keyCode, KeyEvent event) {
 
         // 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;
         }