You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2014/08/27 22:20:05 UTC
[1/2] webworks commit: Set VERSION to 3.6.0 (via coho)
Repository: cordova-blackberry
Updated Branches:
refs/heads/3.6.x [created] ed435bfc9
Set VERSION to 3.6.0 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/ed435bfc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/ed435bfc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/ed435bfc
Branch: refs/heads/3.6.x
Commit: ed435bfc9e51b22393889f8a2fe1d35afc25ef36
Parents: c32b15b
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Wed Aug 27 16:05:58 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Wed Aug 27 16:05:58 2014 -0400
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/cordova/lib/version.js | 2 +-
package.json | 116 +++++++++++-----------
3 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ed435bfc/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 86bab9c..40c341b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev
+3.6.0
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ed435bfc/bin/templates/project/cordova/lib/version.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/version.js b/bin/templates/project/cordova/lib/version.js
index ac3bb54..63a737d 100755
--- a/bin/templates/project/cordova/lib/version.js
+++ b/bin/templates/project/cordova/lib/version.js
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.6.0-dev";
+var VERSION = "3.6.0";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ed435bfc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a03a21e..7a70239 100644
--- a/package.json
+++ b/package.json
@@ -1,59 +1,59 @@
{
- "name": "cordova-blackberry10",
- "version": "3.5.0",
- "description": "cordova-blackberry release",
- "repository": {
- "type":"git",
- "url":"https://git-wip-us.apache.org/repos/asf/cordova-blackberry.git"
- },
- "author": "Apache Software Foundation",
- "licenses": "Apache Version 2.0",
- "keywords":[
- "blackberry",
- "apache",
- "cordova"
- ],
- "engines": {
- "node": ">=0.9.9"
- },
- "scripts": {
- "test": "npm run jshint && npm run jasmine",
- "jshint": "node_modules/grunt-cli/bin/grunt jshint --force",
- "jasmine": "node_modules/grunt-cli/bin/grunt jasmine_node"
- },
- "dependencies": {
- "jWorkflow": "0.8.0",
- "commander": "0.5.2",
- "localize": "*0.4.2",
- "zip": "0.0.6",
- "xml2js": "0.1.13",
- "validator": "0.4.1",
- "wrench": "1.4.4",
- "shelljs":"0.2.6",
- "exit": "0.1.1",
- "elementtree": "0.1.5",
- "prompt": "0.2.11",
- "async": "0.2.9"
- },
- "bundledDependencies": [
- "jWorkflow",
- "commander",
- "localize",
- "zip",
- "xml2js",
- "validator",
- "wrench",
- "shelljs",
- "exit",
- "elementtree",
- "prompt",
- "async"
- ],
- "devDependencies": {
- "grunt-contrib-jshint": "*",
- "grunt-jasmine-node": "*",
- "grunt-cli": "*",
- "jasmine-node": "1.7.1"
- },
- "readmeFilename": "README.md"
-}
+ "name": "cordova-blackberry10",
+ "version": "3.6.0",
+ "description": "cordova-blackberry release",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-blackberry.git"
+ },
+ "author": "Apache Software Foundation",
+ "licenses": "Apache Version 2.0",
+ "keywords": [
+ "blackberry",
+ "apache",
+ "cordova"
+ ],
+ "engines": {
+ "node": ">=0.9.9"
+ },
+ "scripts": {
+ "test": "npm run jshint && npm run jasmine",
+ "jshint": "node_modules/grunt-cli/bin/grunt jshint --force",
+ "jasmine": "node_modules/grunt-cli/bin/grunt jasmine_node"
+ },
+ "dependencies": {
+ "jWorkflow": "0.8.0",
+ "commander": "0.5.2",
+ "localize": "*0.4.2",
+ "zip": "0.0.6",
+ "xml2js": "0.1.13",
+ "validator": "0.4.1",
+ "wrench": "1.4.4",
+ "shelljs": "0.2.6",
+ "exit": "0.1.1",
+ "elementtree": "0.1.5",
+ "prompt": "0.2.11",
+ "async": "0.2.9"
+ },
+ "bundledDependencies": [
+ "jWorkflow",
+ "commander",
+ "localize",
+ "zip",
+ "xml2js",
+ "validator",
+ "wrench",
+ "shelljs",
+ "exit",
+ "elementtree",
+ "prompt",
+ "async"
+ ],
+ "devDependencies": {
+ "grunt-contrib-jshint": "*",
+ "grunt-jasmine-node": "*",
+ "grunt-cli": "*",
+ "jasmine-node": "1.7.1"
+ },
+ "readmeFilename": "README.md"
+}
\ No newline at end of file
[2/2] webworks commit: Update JS snapshot to version 3.6.0 (via coho)
Posted by bh...@apache.org.
Update JS snapshot to version 3.6.0 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/c32b15b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/c32b15b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/c32b15b2
Branch: refs/heads/3.6.x
Commit: c32b15b249438d969d94c39c348b141acaf898e7
Parents: e547827
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Wed Aug 27 16:05:58 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Wed Aug 27 16:05:58 2014 -0400
----------------------------------------------------------------------
javascript/cordova.blackberry10.js | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c32b15b2/javascript/cordova.blackberry10.js
----------------------------------------------------------------------
diff --git a/javascript/cordova.blackberry10.js b/javascript/cordova.blackberry10.js
index 1f40cd1..54b1c0a 100644
--- a/javascript/cordova.blackberry10.js
+++ b/javascript/cordova.blackberry10.js
@@ -1,5 +1,5 @@
// Platform: blackberry10
-// 3.6.0-dev-7e845f3
+// 3.6.3
/*
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-7e845f3';
+var CORDOVA_JS_BUILD_LABEL = '3.6.3';
// 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);
}
},
@@ -868,8 +868,13 @@ function RemoteFunctionCall(functionUri) {
var requestUri = composeUri(),
request = createXhrRequest(requestUri, false),
response;
- request.send(JSON.stringify(params));
- response = JSON.parse(decodeURIComponent(request.responseText) || "null");
+ try {
+ request.send(JSON.stringify(params));
+ response = JSON.parse(decodeURIComponent(request.responseText) || "null");
+ } catch (e) {
+ console.error('makeSyncCall failed', e);
+ response = { code: 500, msg: 'exec bridge failure' };
+ }
return response;
};
@@ -1412,11 +1417,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;
}
}