You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/11/08 22:31:59 UTC
[1/2] git commit: Update JS snapshot to version 3.2.0-rc1 (via coho)
Updated Branches:
refs/heads/3.2.x [created] d1ff26c1c
Update JS snapshot to version 3.2.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/6c9b4b56
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/6c9b4b56
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/6c9b4b56
Branch: refs/heads/3.2.x
Commit: 6c9b4b56279e857e5a1a5dd03c0cbd5c88dee3d3
Parents: 6c4848a
Author: Steven Gill <st...@gmail.com>
Authored: Fri Nov 8 13:30:21 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Nov 8 13:30:21 2013 -0800
----------------------------------------------------------------------
cordova-lib/cordova.js | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/6c9b4b56/cordova-lib/cordova.js
----------------------------------------------------------------------
diff --git a/cordova-lib/cordova.js b/cordova-lib/cordova.js
index 440ef39..6234d2d 100644
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@ -1,5 +1,5 @@
// Platform: firefoxos
-// 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 */
@@ -797,10 +797,10 @@ define("cordova/exec", function(require, exports, module) {
//var firefoxos = require('cordova/platform');
var cordova = require('cordova');
-var commandProxy = require('cordova/firefoxos/commandProxy');
+var execProxy = require('cordova/exec/proxy');
module.exports = function(success, fail, service, action, args) {
- var proxy = commandProxy.get(service,action);
+ var proxy = execProxy.get(service,action);
if(proxy) {
var callbackId = service + cordova.callbackId++;
//console.log("EXEC:" + service + " : " + action);
@@ -821,8 +821,8 @@ module.exports = function(success, fail, service, action, args) {
});
-// file: lib/firefoxos/firefoxos/commandProxy.js
-define("cordova/firefoxos/commandProxy", function(require, exports, module) {
+// file: lib/common/exec/proxy.js
+define("cordova/exec/proxy", function(require, exports, module) {
// internal map of proxy function
@@ -851,6 +851,14 @@ module.exports = {
};
});
+// file: lib/firefoxos/firefoxos/commandProxy.js
+define("cordova/firefoxos/commandProxy", function(require, exports, module) {
+
+console.log('WARNING: please require cordova/exec/proxy instead');
+module.exports = require('cordova/exec/proxy');
+
+});
+
// file: lib/firefoxos/init.js
define("cordova/init", function(require, exports, module) {
@@ -1087,7 +1095,7 @@ module.exports = {
cordovaVersion: '3.0.0',
bootstrap: function() {
- require('cordova/modulemapper').clobbers('cordova/firefoxos/commandProxy', 'cordova.commandProxy');
+ require('cordova/modulemapper').clobbers('cordova/exec/proxy', 'cordova.commandProxy');
require('cordova/channel').onNativeReady.fire();
}
};
[2/2] git commit: Set VERSION to 3.2.0-rc1 (via coho)
Posted by st...@apache.org.
Set VERSION to 3.2.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/d1ff26c1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/d1ff26c1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/d1ff26c1
Branch: refs/heads/3.2.x
Commit: d1ff26c1c4afac3fb486a03637c930fdd59c15d0
Parents: 6c9b4b5
Author: Steven Gill <st...@gmail.com>
Authored: Fri Nov 8 13:30:22 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Nov 8 13:30:22 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/d1ff26c1/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