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/01/31 01:58:35 UTC
[1/2] git commit: Set VERSION to 3.4.0-rc1 (via coho)
Updated Branches:
refs/heads/3.4.x [created] c4ab88a74
Set VERSION to 3.4.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/c4ab88a7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/c4ab88a7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/c4ab88a7
Branch: refs/heads/3.4.x
Commit: c4ab88a7495fc1be4045a95581bc0135665635c5
Parents: 48ae8e9
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jan 30 16:57:02 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jan 30 16:57:02 2014 -0800
----------------------------------------------------------------------
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/c4ab88a7/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 688932a..ee13a2b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.0-dev
+3.4.0-rc1
[2/2] git commit: Update JS snapshot to version 3.4.0-rc1 (via coho)
Posted by st...@apache.org.
Update JS snapshot to version 3.4.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/48ae8e97
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/48ae8e97
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/48ae8e97
Branch: refs/heads/3.4.x
Commit: 48ae8e97c9b4cf6aa4fece0222891b75e7f344c1
Parents: ded6deb
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jan 30 16:57:02 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jan 30 16:57:02 2014 -0800
----------------------------------------------------------------------
cordova-lib/cordova.js | 50 ++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/48ae8e97/cordova-lib/cordova.js
----------------------------------------------------------------------
diff --git a/cordova-lib/cordova.js b/cordova-lib/cordova.js
index 2b30024..dc5698a 100644
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@ -1,5 +1,5 @@
// Platform: firefoxos
-// 3.4.0-dev-c320378
+// 3.4.0-rc1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.4.0-dev-c320378';
-// file: lib/scripts/require.js
+var CORDOVA_JS_BUILD_LABEL = '3.4.0-rc1';
+// file: src/scripts/require.js
/*jshint -W079 */
/*jshint -W020 */
@@ -98,7 +98,7 @@ if (typeof module === "object" && typeof require === "function") {
module.exports.define = define;
}
-// file: lib/cordova.js
+// file: src/cordova.js
define("cordova", function(require, exports, module) {
@@ -316,7 +316,7 @@ module.exports = cordova;
});
-// file: lib/common/argscheck.js
+// file: src/common/argscheck.js
define("cordova/argscheck", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -382,7 +382,7 @@ moduleExports.enableChecks = true;
});
-// file: lib/common/base64.js
+// file: src/common/base64.js
define("cordova/base64", function(require, exports, module) {
var base64 = exports;
@@ -438,7 +438,7 @@ function uint8ToBase64(rawData) {
});
-// file: lib/common/builder.js
+// file: src/common/builder.js
define("cordova/builder", function(require, exports, module) {
var utils = require('cordova/utils');
@@ -551,7 +551,7 @@ exports.replaceHookForTesting = function() {};
});
-// file: lib/common/channel.js
+// file: src/common/channel.js
define("cordova/channel", function(require, exports, module) {
var utils = require('cordova/utils'),
@@ -792,7 +792,7 @@ module.exports = channel;
});
-// file: lib/firefoxos/exec.js
+// file: src/firefoxos/exec.js
define("cordova/exec", function(require, exports, module) {
//var firefoxos = require('cordova/platform');
@@ -821,7 +821,7 @@ module.exports = function(success, fail, service, action, args) {
});
-// file: lib/common/exec/proxy.js
+// file: src/common/exec/proxy.js
define("cordova/exec/proxy", function(require, exports, module) {
@@ -851,7 +851,7 @@ module.exports = {
};
});
-// file: lib/firefoxos/firefoxos/commandProxy.js
+// file: src/firefoxos/firefoxos/commandProxy.js
define("cordova/firefoxos/commandProxy", function(require, exports, module) {
console.log('WARNING: please require cordova/exec/proxy instead');
@@ -859,7 +859,7 @@ module.exports = require('cordova/exec/proxy');
});
-// file: lib/firefoxos/init.js
+// file: src/firefoxos/init.js
define("cordova/init", function(require, exports, module) {
/*
@@ -986,7 +986,7 @@ channel.join(function() {
});
-// file: lib/common/modulemapper.js
+// file: src/common/modulemapper.js
define("cordova/modulemapper", function(require, exports, module) {
var builder = require('cordova/builder'),
@@ -1087,7 +1087,7 @@ exports.reset();
});
-// file: lib/firefoxos/platform.js
+// file: src/firefoxos/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1102,10 +1102,11 @@ module.exports = {
});
-// file: lib/common/pluginloader.js
+// file: src/common/pluginloader.js
define("cordova/pluginloader", function(require, exports, module) {
var modulemapper = require('cordova/modulemapper');
+var urlutil = require('cordova/urlutil');
// Helper function to inject a <script> tag.
function injectScript(url, onload, onerror) {
@@ -1174,11 +1175,14 @@ function handlePluginsObject(path, moduleList, finishPluginLoading) {
}
function injectPluginScript(pathPrefix, finishPluginLoading) {
- injectScript(pathPrefix + 'cordova_plugins.js', function(){
+ var pluginPath = pathPrefix + 'cordova_plugins.js';
+
+ injectScript(pluginPath, function() {
try {
var moduleList = require("cordova/plugin_list");
handlePluginsObject(pathPrefix, moduleList, finishPluginLoading);
- } catch (e) {
+ }
+ catch (e) {
// Error loading cordova_plugins.js, file not found or something
// this is an acceptable error, pre-3.0.0, so we just move on.
finishPluginLoading();
@@ -1215,24 +1219,24 @@ exports.load = function(callback) {
});
-// file: lib/common/urlutil.js
+// file: src/common/urlutil.js
define("cordova/urlutil", function(require, exports, module) {
-var urlutil = exports;
-var anchorEl = document.createElement('a');
/**
* For already absolute URLs, returns what is passed in.
* For relative URLs, converts them to absolute ones.
*/
-urlutil.makeAbsolute = function(url) {
+exports.makeAbsolute = function makeAbsolute(url) {
+ var anchorEl = document.createElement('a');
anchorEl.href = url;
return anchorEl.href;
};
+
});
-// file: lib/common/utils.js
+// file: src/common/utils.js
define("cordova/utils", function(require, exports, module) {
var utils = exports;
@@ -1403,7 +1407,7 @@ function UUIDcreatePart(length) {
});
window.cordova = require('cordova');
-// file: lib/scripts/bootstrap.js
+// file: src/scripts/bootstrap.js
require('cordova/init');