github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:callback/callback-android

Browse Source
This commit is contained in:
Joe Bowser
2011-11-02 13:10:50 -07:00
parent e1d3f1491f 538cdb03fc
commit 7244a5a727
10 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/phonegap.js.base
+3 -4
View File
@@ -17,6 +17,8 @@
* under the License.
*/
// Version 1.2.0
if (typeof PhoneGap === "undefined") {
/**
@@ -387,9 +389,6 @@ PhoneGap.Channel.join(function() {
prompt("", "gap_init:");
PhoneGap.onDeviceReady.fire();
// Fire the onresume event, since first one happens before JavaScript is loaded
PhoneGap.onResume.fire();
}, PhoneGap.deviceReadyChannelsArray);
}, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);
@@ -933,7 +932,7 @@ PhoneGap.JSCallback = function() {
// If server is stopping
else if (xmlhttp.status === 503) {
console.log("JSCallback Error: Service unavailable. Stopping callbacks.");
console.log("JSCallback Server Closed: Stopping callbacks.");
}
// If request wasn't GET
framework/assets/www/index.html
+1 -1
View File
@@ -1,7 +1,7 @@
<html>
<head>
<title></title>
<script src="phonegap-1.1.0.js"></script>
<script src="phonegap-1.2.0.js"></script>
</head>
<body>
framework/src/com/phonegap/Device.java
Regular → Executable
+1 -1
View File
@@ -29,7 +29,7 @@ import android.provider.Settings;
public class Device extends Plugin {
public static String phonegapVersion = "1.1.0"; // PhoneGap version
public static String phonegapVersion = "1.2.0"; // PhoneGap version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID