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:59 UTC
[2/2] git commit: Update JS snapshot to version 3.6.0 (via coho)
Update JS snapshot to version 3.6.0 (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/3471a526
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/3471a526
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/3471a526
Branch: refs/heads/3.6.x
Commit: 3471a526604a789d0200c965595f9a8287b30bbd
Parents: 1627e7d
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 26 17:27:25 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 26 17:27:25 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/3471a526/cordova-lib/cordova.js
----------------------------------------------------------------------
diff --git a/cordova-lib/cordova.js b/cordova-lib/cordova.js
index d2a497d..91e2aaa 100644
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@ -1,5 +1,5 @@
// Platform: firefoxos
-// 3.6.0-dev-4d1c898
+// 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-4d1c898';
+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);
}
},
@@ -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