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 2014/08/27 02:32:55 UTC
[1/2] git commit: Set VERSION to 3.7.0-dev (via coho)
Repository: cordova-firefoxos
Updated Branches:
refs/heads/master 1627e7d75 -> 8b8132265
Set VERSION to 3.7.0-dev (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/3206a19e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/3206a19e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/3206a19e
Branch: refs/heads/master
Commit: 3206a19eb41378f9f425a2995124fce8348d54d7
Parents: 1627e7d
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 26 17:27:26 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 26 17:27:26 2014 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/cordova/version | 2 +-
package.json | 59 +++++++++++++++++-------------
3 files changed, 36 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/3206a19e/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 86bab9c..a4ce38e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev
+3.7.0-dev
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/3206a19e/bin/templates/project/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/version b/bin/templates/project/cordova/version
index f935529..2e1ade7 100755
--- a/bin/templates/project/cordova/version
+++ b/bin/templates/project/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.5.0";
+var VERSION = "3.7.0-dev";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/3206a19e/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4b97664..df64d5c 100644
--- a/package.json
+++ b/package.json
@@ -1,26 +1,35 @@
{
- "name": "cordova-firefoxos",
- "version": "3.5.0",
- "description": "cordova-firefoxos release",
- "main": "bin/create",
- "repository": {
- "type": "git",
- "url": "https://git-wip-us.apache.org/repos/asf/cordova-firefoxos.git"
- },
- "keywords": [
- "cordova",
- "firefoxos",
- "apache"
- ],
- "dependencies": {
- "shelljs": "^0.1.4",
- "adm-zip": "0.4.4"
- },
- "author": "Apache Software Foundation",
- "contributors": [
- {"name": "James Long","email": "jlong@mozilla.com"},
- {"name": "Herm Wong", "email": "hermanw@adobe.com"},
- {"name": "Steve Gill", "email": "steveng@adobe.com"}
- ],
- "license": "Apache Version 2.0"
-}
+ "name": "cordova-firefoxos",
+ "version": "3.7.0-dev",
+ "description": "cordova-firefoxos release",
+ "main": "bin/create",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-firefoxos.git"
+ },
+ "keywords": [
+ "cordova",
+ "firefoxos",
+ "apache"
+ ],
+ "dependencies": {
+ "shelljs": "^0.1.4",
+ "adm-zip": "0.4.4"
+ },
+ "author": "Apache Software Foundation",
+ "contributors": [
+ {
+ "name": "James Long",
+ "email": "jlong@mozilla.com"
+ },
+ {
+ "name": "Herm Wong",
+ "email": "hermanw@adobe.com"
+ },
+ {
+ "name": "Steve Gill",
+ "email": "steveng@adobe.com"
+ }
+ ],
+ "license": "Apache Version 2.0"
+}
\ No newline at end of file
[2/2] git commit: Update JS snapshot to version 3.7.0-dev (via coho)
Posted by st...@apache.org.
Update JS snapshot to version 3.7.0-dev (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/8b813226
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/8b813226
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/8b813226
Branch: refs/heads/master
Commit: 8b81322657db522decdb46a71024e646adef718a
Parents: 3206a19
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 26 17:27:32 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 26 17:27:32 2014 -0700
----------------------------------------------------------------------
cordova-lib/cordova.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/8b813226/cordova-lib/cordova.js
----------------------------------------------------------------------
diff --git a/cordova-lib/cordova.js b/cordova-lib/cordova.js
index d2a497d..f01d7c8 100644
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@ -1,5 +1,5 @@
// Platform: firefoxos
-// 3.6.0-dev-4d1c898
+// 3.7.0-dev-8f41e8d
/*
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.6.0-dev-4d1c898';
+var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -265,7 +265,7 @@ var cordova = {
try {
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
} catch (e) {
- console.log("Error in error callback: " + callbackId + " = "+e);
+ console.log("Error in success callback: " + callbackId + " = "+e);
}
},
@@ -1210,7 +1210,9 @@ module.exports = {
id: 'firefoxos',
bootstrap: function() {
- require('cordova/modulemapper').clobbers('cordova/exec/proxy', 'cordova.commandProxy');
+ var modulemapper = require('cordova/modulemapper');
+
+ modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
require('cordova/channel').onNativeReady.fire();
}
};
@@ -1300,11 +1302,11 @@ function handlePluginsObject(path, moduleList, finishPluginLoading) {
function findCordovaPath() {
var path = null;
var scripts = document.getElementsByTagName('script');
- var term = 'cordova.js';
+ var term = '/cordova.js';
for (var n = scripts.length-1; n>-1; n--) {
var src = scripts[n].src.replace(/\?.*$/, ''); // Strip any query param (CB-6007).
if (src.indexOf(term) == (src.length - term.length)) {
- path = src.substring(0, src.length - term.length);
+ path = src.substring(0, src.length - term.length) + '/';
break;
}
}
@@ -1521,4 +1523,4 @@ window.cordova = require('cordova');
require('cordova/init');
-})();
+})();
\ No newline at end of file