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

This commit is contained in:
Joe Bowser
2010-05-31 11:37:41 -07:00
6 changed files with 40 additions and 11 deletions
+5 -1
View File
@@ -17,7 +17,11 @@ function Device() {
this.version = window.DroidGap.getOSVersion();
this.gapVersion = window.DroidGap.getVersion();
this.platform = window.DroidGap.getPlatform();
this.name = window.DroidGap.getProductName();
this.name = window.DroidGap.getProductName();
this.line1Number = window.DroidGap.getLine1Number();
this.deviceId = window.DroidGap.getDeviceId();
this.simSerialNumber = window.DroidGap.getSimSerialNumber();
this.subscriberId = window.DroidGap.getSubscriberId();
}
} catch(e) {
this.available = false;
+2 -2
View File
@@ -80,10 +80,10 @@ var dbSetup = function(name, version, display_name, size)
}
PhoneGap.addConstructor(function() {
if (typeof navigator.openDatabase == "undefined")
if (typeof window.openDatabase == "undefined")
{
navigator.openDatabase = window.openDatabase = dbSetup;
window.droiddb = new DroidDB();
window.droiddb = new DroidDB();
}
});