You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/11/04 20:17:55 UTC
[1/2] android commit: Update JS snapshot to version 3.2.0-rc1 (via
coho)
Updated Branches:
refs/heads/3.2.x [created] fb3fb416b
Update JS snapshot to version 3.2.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/31195a18
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/31195a18
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/31195a18
Branch: refs/heads/3.2.x
Commit: 31195a1817d672271849b1299ac7c61cc882946a
Parents: 6e4ef50
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Nov 4 09:50:37 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Nov 4 09:50:37 2013 -0800
----------------------------------------------------------------------
framework/assets/www/cordova.js | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/31195a18/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 0c1edec..fe247cc 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.2.0-dev-5ad41a7
+// 3.2.0-rc1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.2.0-dev-5ad41a7';
+var CORDOVA_JS_BUILD_LABEL = '3.2.0-rc1';
// file: lib/scripts/require.js
/*jshint -W079 */
@@ -1074,6 +1074,36 @@ module.exports = androidExec;
});
+// file: lib/common/exec/proxy.js
+define("cordova/exec/proxy", function(require, exports, module) {
+
+
+// internal map of proxy function
+var CommandProxyMap = {};
+
+module.exports = {
+
+ // example: cordova.commandProxy.add("Accelerometer",{getCurrentAcceleration: function(successCallback, errorCallback, options) {...},...);
+ add:function(id,proxyObj) {
+ console.log("adding proxy for " + id);
+ CommandProxyMap[id] = proxyObj;
+ return proxyObj;
+ },
+
+ // cordova.commandProxy.remove("Accelerometer");
+ remove:function(id) {
+ var proxy = CommandProxyMap[id];
+ delete CommandProxyMap[id];
+ CommandProxyMap[id] = null;
+ return proxy;
+ },
+
+ get:function(service,action) {
+ return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
+ }
+};
+});
+
// file: lib/common/init.js
define("cordova/init", function(require, exports, module) {
[2/2] android commit: Set VERSION to 3.2.0-rc1 (via coho)
Posted by bo...@apache.org.
Set VERSION to 3.2.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fb3fb416
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fb3fb416
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fb3fb416
Branch: refs/heads/3.2.x
Commit: fb3fb416b1bdc1dbe0f24fe20c1322d36be42b23
Parents: 31195a1
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Nov 4 09:50:38 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Nov 4 09:50:38 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb3fb416/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index df4a767..3178e83 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.0-dev
+3.2.0-rc1
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb3fb416/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 36c3388..6ce5f80 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.2.0-dev";
+var VERSION = "3.2.0-rc1";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fb3fb416/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index fe6eece..e9feaca 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -61,7 +61,7 @@ public class CordovaWebView extends WebView {
public static final String TAG = "CordovaWebView";
- public static final String CORDOVA_VERSION = "3.2.0-dev";
+ public static final String CORDOVA_VERSION = "3.2.0-rc1";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();