You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2012/08/31 22:45:47 UTC
android commit: Tagging 2.1.0rc2
Updated Branches:
refs/heads/master 12e5b39c0 -> 774d21747
Tagging 2.1.0rc2
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/774d2174
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/774d2174
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/774d2174
Branch: refs/heads/master
Commit: 774d21747a92725a720dc81bb401ae496a267d3f
Parents: 12e5b39
Author: Simon MacDonald <si...@gmail.com>
Authored: Fri Aug 31 16:44:53 2012 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Fri Aug 31 16:44:53 2012 -0400
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 28 +++-----------------
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
5 files changed, 9 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/774d2174/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 0c271bc..51c0fcb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0rc1
+2.1.0rc2
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/774d2174/bin/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
index 1ec3bce..202b638 100644
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -15,7 +15,7 @@
<p class="status complete blink hide">Device is Ready</p>
</div>
</div>
- <script type="text/javascript" src="cordova-2.1.0rc1.js"></script>
+ <script type="text/javascript" src="cordova-2.1.0rc2.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
app.initialize();
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/774d2174/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 7eabde3..0301815 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit 69d652e9dcaaaf4bdaa55ec37329636dd5b20fbe
+// commit 2aa46aa0eef2ba641cf91793735152d7fb5b6998
-// File generated at :: Fri Aug 24 2012 16:38:32 GMT-0400 (EDT)
+// File generated at :: Fri Aug 31 2012 16:26:04 GMT-0400 (EDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -29,10 +29,6 @@ var require,
(function () {
var modules = {};
- // Stack of moduleIds currently being built.
- var requireStack = [];
- // Map of module ID -> index into requireStack of modules currently being built.
- var inProgressModules = {};
function build(module) {
var factory = module.factory;
@@ -45,21 +41,8 @@ var require,
require = function (id) {
if (!modules[id]) {
throw "module " + id + " not found";
- } else if (id in inProgressModules) {
- var cycle = requireStack.slice(inProgressModules[id]).join('->') + '->' + id;
- throw "Cycle in require graph: " + cycle;
}
- if (modules[id].factory) {
- try {
- inProgressModules[id] = requireStack.length;
- requireStack.push(id);
- return build(modules[id]);
- } finally {
- delete inProgressModules[id];
- requireStack.pop();
- }
- }
- return modules[id].exports;
+ return modules[id].factory ? build(modules[id]) : modules[id].exports;
};
define = function (id, factory) {
@@ -84,7 +67,6 @@ if (typeof module === "object" && typeof require === "function") {
module.exports.require = require;
module.exports.define = define;
}
-
// file: lib/cordova.js
define("cordova", function(require, exports, module) {
var channel = require('cordova/channel');
@@ -958,7 +940,7 @@ function androidExec(success, fail, service, action, args) {
}
if (jsToNativeBridgeMode == jsToNativeModes.LOCATION_CHANGE) {
- window.location = 'http://cdv_exec/' + service + '#' + action + '#' + callbackId + '#' + argsJson;
+ window.location = 'http://cdv_exec/' + service + '#' + action + '#' + callbackId + '#' + argsJson;
} else if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT) {
// Explicit cast to string is required on Android 2.1 to convert from
// a Java string to a JS string.
@@ -1023,7 +1005,7 @@ function androidExec(success, fail, service, action, args) {
} catch (e2) {
console.log("Error: "+e2);
}
-};
+}
function onOnLineEvent(e) {
while (polling.pollOnce());
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/774d2174/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 23f1c05..7f5288d 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
<html>
<head>
<title></title>
- <script src="cordova-2.1.0rc1.js"></script>
+ <script src="cordova-2.1.0rc2.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/774d2174/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index 958202e..c852aaa 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin {
public static final String TAG = "Device";
- public static String cordovaVersion = "2.1.0rc1"; // Cordova version
+ public static String cordovaVersion = "2.1.0rc2"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID