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

Starting incrementing the tag to RC2

Browse Source
This commit is contained in:
Joe Bowser 2012-10-24 12:06:00 -07:00
parent 5f1cda07e7
commit bef0d47924
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.2.0rc1
2.2.0rc2

2
bin/templates/project/assets/www/index.html
View File

@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p>
</div>
</div>
<script type="text/javascript" src="cordova-2.2.0rc1.js"></script>
<script type="text/javascript" src="cordova-2.2.0rc2.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
app.initialize();

9
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 98d190ad98ec48f4f06c61286faee99c0eb000ed
// commit 884cb0e8f4809b6182b41101c092eee1139f82da
// File generated at :: Mon Oct 15 2012 13:22:37 GMT-0700 (PDT)
// File generated at :: Wed Oct 24 2012 11:51:57 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@ -695,7 +695,6 @@ module.exports = {
return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
}
};
});
// file: lib/common/common.js
@ -6322,8 +6321,8 @@ utils.extend = (function() {
* Alerts a message in any available way: alert or console.log.
*/
utils.alert = function(msg) {
if (alert) {
alert(msg);
if (window.alert) {
window.alert(msg);
} else if (console && console.log) {
console.log(msg);
}

2
framework/src/org/apache/cordova/Device.java
View File

@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin {
public static final String TAG = "Device";
public static String cordovaVersion = "2.2.0rc1"; // Cordova version
public static String cordovaVersion = "2.2.0rc2"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID