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

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

Browse Source
This commit is contained in:
macdonst 2011-06-28 14:26:50 -04:00
commit 2a786044de
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.9.5 0.9.6

12
framework/assets/js/phonegap.js.base
View File

@ -805,13 +805,11 @@ PhoneGap.JSCallback = function() {
console.log("JSCallback Error: Bad request. Stopping callbacks."); console.log("JSCallback Error: Bad request. Stopping callbacks.");
} }
// If error, restart callback server // If error, revert to polling
else { else {
console.log("JSCallback Error: Request failed."); console.log("JSCallback Error: Request failed.");
prompt("restartServer", "gap_callbackServer:"); PhoneGap.UsePolling = true;
PhoneGap.JSCallbackPort = null; PhoneGap.JSCallbackPolling();
PhoneGap.JSCallbackToken = null;
setTimeout(PhoneGap.JSCallback, 100);
} }
} }
}; };
@ -938,7 +936,11 @@ PhoneGap.includeJavascript = function(jsfile, successCallback) {
*/ */
var PluginManager = { var PluginManager = {
addService: function(serviceType, className) { addService: function(serviceType, className) {
try {
navigator.app.addService(serviceType, className); navigator.app.addService(serviceType, className);
} catch (e) {
console.log("Error adding service "+serviceType+": "+e);
}
} }
}; };

2
framework/default.properties
View File

@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-8 target=android-12
apk-configurations= apk-configurations=