From bef0d479247c7cede3f1ffc85557ab38b0ac9dfd Mon Sep 17 00:00:00 2001 From: Joe Bowser <bowserj@apache.org> Date: Wed, 24 Oct 2012 12:06:00 -0700 Subject: [PATCH] Starting incrementing the tag to RC2 --- VERSION | 2 +- bin/templates/project/assets/www/index.html | 2 +- framework/assets/js/cordova.android.js | 9 ++++----- framework/src/org/apache/cordova/Device.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index bdc2ab64..8b6adce4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0rc1 +2.2.0rc2 diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html index 4bf65824..f705720f 100644 --- a/bin/templates/project/assets/www/index.html +++ b/bin/templates/project/assets/www/index.html @@ -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(); diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js index e786749c..8734fd5c 100644 --- a/framework/assets/js/cordova.android.js +++ b/framework/assets/js/cordova.android.js @@ -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); } diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java index 55b484f1..16eb785b 100644 --- a/framework/src/org/apache/cordova/Device.java +++ b/framework/src/org/apache/cordova/Device.java @@ -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