You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2014/01/23 01:44:29 UTC
[1/3] android commit: Manually incrementing version
Updated Branches:
refs/heads/3.4.x [created] 5981023a4
Manually incrementing version
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/09e1c00f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/09e1c00f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/09e1c00f
Branch: refs/heads/3.4.x
Commit: 09e1c00fb812a1067710b6be7534f98a473d61f4
Parents: 600599f
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jan 22 16:10:45 2014 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jan 22 16:10:45 2014 -0800
----------------------------------------------------------------------
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/09e1c00f/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/3] android commit: Update JS snapshot to version 3.4.0-rc1 (via
coho)
Posted by bo...@apache.org.
Update JS snapshot to version 3.4.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/89f9ac19
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/89f9ac19
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/89f9ac19
Branch: refs/heads/3.4.x
Commit: 89f9ac19578cb85fd50e20cf3d3d61822f34d222
Parents: 09e1c00
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jan 22 16:30:00 2014 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jan 22 16:30:00 2014 -0800
----------------------------------------------------------------------
framework/assets/www/cordova.js | 60 +++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/89f9ac19/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index f3778f5..484f3e4 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.3.0-dev-c9de1bc
+// 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.3.0-dev-c9de1bc';
-// file: lib/scripts/require.js
+var CORDOVA_JS_BUILD_LABEL = '3.4.0-rc1';
+// file: src/scripts/require.js
/*jshint -W079 */
/*jshint -W020 */
@@ -34,7 +34,7 @@ var require,
requireStack = [],
// Map of module ID -> index into requireStack of modules currently being built.
inProgressModules = {},
- SEPERATOR = ".";
+ SEPARATOR = ".";
@@ -44,7 +44,7 @@ var require,
var resultantId = id;
//Its a relative path, so lop off the last portion and add the id (minus "./")
if (id.charAt(0) === ".") {
- resultantId = module.id.slice(0, module.id.lastIndexOf(SEPERATOR)) + SEPERATOR + id.slice(2);
+ resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
}
return require(resultantId);
};
@@ -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/android/android/nativeapiprovider.js
+// file: src/android/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) {
/**
@@ -339,7 +339,7 @@ module.exports = {
});
-// file: lib/android/android/promptbasednativeapi.js
+// file: src/android/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/**
@@ -361,7 +361,7 @@ module.exports = {
});
-// file: lib/common/argscheck.js
+// file: src/common/argscheck.js
define("cordova/argscheck", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -427,7 +427,7 @@ moduleExports.enableChecks = true;
});
-// file: lib/common/base64.js
+// file: src/common/base64.js
define("cordova/base64", function(require, exports, module) {
var base64 = exports;
@@ -483,7 +483,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');
@@ -552,7 +552,7 @@ function include(parent, objects, clobber, merge) {
include(result, obj.children, clobber, merge);
}
} catch(e) {
- utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+ utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
}
});
}
@@ -596,7 +596,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'),
@@ -837,7 +837,7 @@ module.exports = channel;
});
-// file: lib/android/exec.js
+// file: src/android/exec.js
define("cordova/exec", function(require, exports, module) {
/**
@@ -1074,7 +1074,7 @@ module.exports = androidExec;
});
-// file: lib/common/exec/proxy.js
+// file: src/common/exec/proxy.js
define("cordova/exec/proxy", function(require, exports, module) {
@@ -1104,7 +1104,7 @@ module.exports = {
};
});
-// file: lib/common/init.js
+// file: src/common/init.js
define("cordova/init", function(require, exports, module) {
var channel = require('cordova/channel');
@@ -1218,7 +1218,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'),
@@ -1319,7 +1319,7 @@ exports.reset();
});
-// file: lib/android/platform.js
+// file: src/android/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1360,7 +1360,7 @@ module.exports = {
});
-// file: lib/android/plugin/android/app.js
+// file: src/android/plugin/android/app.js
define("cordova/plugin/android/app", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -1437,10 +1437,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) {
@@ -1509,11 +1510,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();
@@ -1550,24 +1554,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;
@@ -1738,7 +1742,7 @@ function UUIDcreatePart(length) {
});
window.cordova = require('cordova');
-// file: lib/scripts/bootstrap.js
+// file: src/scripts/bootstrap.js
require('cordova/init');
[3/3] android commit: Set VERSION to 3.4.0-rc1 (via coho)
Posted by bo...@apache.org.
Set VERSION to 3.4.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/5981023a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/5981023a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/5981023a
Branch: refs/heads/3.4.x
Commit: 5981023a4c34cc1fa29da582c16187ba50fabce9
Parents: 89f9ac1
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jan 22 16:30:01 2014 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jan 22 16:30:01 2014 -0800
----------------------------------------------------------------------
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5981023a/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 61b62e6..54dd1a1 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.4.0-dev";
+var VERSION = "3.4.0-rc1";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5981023a/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index a6a4ac7..1964fba 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
public class CordovaWebView extends WebView {
public static final String TAG = "CordovaWebView";
- public static final String CORDOVA_VERSION = "3.4.0-dev";
+ public static final String CORDOVA_VERSION = "3.4.0-rc1";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();