cordova.require("cordova") is pretty funny. wish i didnt write it

apache · Mar 9, 2012 · 4b05ead · 4b05ead
1 parent b429286
commit 4b05ead
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
@@ -1068,7 +1068,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.require('cordova').fireDocumentEvent('backbutton');");
+                this.appView.loadUrl("javascript:cordova.fireDocumentEvent('backbutton');");
                 return true;
             }
 
@@ -1090,13 +1090,13 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
         // If menu key
         else if (keyCode == KeyEvent.KEYCODE_MENU) {
-            this.appView.loadUrl("javascript:cordova.require('cordova').fireDocumentEvent('menubutton');");
+            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
             return super.onKeyDown(keyCode, event);
         }
 
         // If search key
         else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-            this.appView.loadUrl("javascript:cordova.require('cordova').fireDocumentEvent('searchbutton');");
+            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('searchbutton');");
             return true;
         }
 

diff --git a/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java b/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
@@ -87,13 +87,13 @@ else if(screenHeight == width)
         // gone away.
         else if (height > oldHeight) {
             if(app != null)
-                app.sendJavascript("cordova.require('cordova').fireDocumentEvent('hidekeyboard');");
+                app.sendJavascript("cordova.fireDocumentEvent('hidekeyboard');");
         } 
         // If the height as gotten smaller then we will assume the soft keyboard has 
         // been displayed.
         else if (height < oldHeight) {
             if(app != null)
-                app.sendJavascript("cordova.require('cordova').fireDocumentEvent('showkeyboard');");
+                app.sendJavascript("cordova.fireDocumentEvent('showkeyboard');");
         }
 
         // Update the old height for the next event

diff --git a/framework/src/org/apache/cordova/api/PluginResult.java b/framework/src/org/apache/cordova/api/PluginResult.java
@@ -84,11 +84,11 @@ public String getJSONString() {
 	}
 
 	public String toSuccessCallbackString(String callbackId) {
-		return "cordova.require('cordova').callbackSuccess('"+callbackId+"',"+this.getJSONString()+");";
+		return "cordova.callbackSuccess('"+callbackId+"',"+this.getJSONString()+");";
 	}
 
 	public String toErrorCallbackString(String callbackId) {
-		return "cordova.require('cordova').callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
+		return "cordova.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
 	}
 
 	public static String[] StatusMessages = new String[] {