github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tagging 2.1.0rc2

Browse Source
This commit is contained in:
Simon MacDonald 2012-08-31 16:44:53 -04:00
parent 12e5b39c05
commit 774d21747a
5 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.1.0rc1 2.1.0rc2

2
bin/templates/project/assets/www/index.html
View File

@ -15,7 +15,7 @@
<p class="status complete blink hide">Device is Ready</p> <p class="status complete blink hide">Device is Ready</p>
</div> </div>
</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" src="js/index.js"></script>
<script type="text/javascript"> <script type="text/javascript">
app.initialize(); app.initialize();

28
framework/assets/js/cordova.android.js
View File

@ -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 Licensed to the Apache Software Foundation (ASF) under one
@ -29,10 +29,6 @@ var require,
(function () { (function () {
var modules = {}; 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) { function build(module) {
var factory = module.factory; var factory = module.factory;
@ -45,21 +41,8 @@ var require,
require = function (id) { require = function (id) {
if (!modules[id]) { if (!modules[id]) {
throw "module " + id + " not found"; 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) { return modules[id].factory ? build(modules[id]) : modules[id].exports;
try {
inProgressModules[id] = requireStack.length;
requireStack.push(id);
return build(modules[id]);
} finally {
delete inProgressModules[id];
requireStack.pop();
}
}
return modules[id].exports;
}; };
define = function (id, factory) { define = function (id, factory) {
@ -84,7 +67,6 @@ if (typeof module === "object" && typeof require === "function") {
module.exports.require = require; module.exports.require = require;
module.exports.define = define; module.exports.define = define;
} }
// file: lib/cordova.js // file: lib/cordova.js
define("cordova", function(require, exports, module) { define("cordova", function(require, exports, module) {
var channel = require('cordova/channel'); var channel = require('cordova/channel');
@ -958,7 +940,7 @@ function androidExec(success, fail, service, action, args) {
} }
if (jsToNativeBridgeMode == jsToNativeModes.LOCATION_CHANGE) { 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) { } else if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT) {
// Explicit cast to string is required on Android 2.1 to convert from // Explicit cast to string is required on Android 2.1 to convert from
// a Java string to a JS string. // a Java string to a JS string.
@ -1023,7 +1005,7 @@ function androidExec(success, fail, service, action, args) {
} catch (e2) { } catch (e2) {
console.log("Error: "+e2); console.log("Error: "+e2);
} }
}; }
function onOnLineEvent(e) { function onOnLineEvent(e) {
while (polling.pollOnce()); while (polling.pollOnce());

2
framework/assets/www/index.html
View File

@ -19,7 +19,7 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<script src="cordova-2.1.0rc1.js"></script> <script src="cordova-2.1.0rc2.js"></script>
</head> </head>
<body> <body>

2
framework/src/org/apache/cordova/Device.java
View File

@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin { public class Device extends Plugin {
public static final String TAG = "Device"; 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 platform = "Android"; // Device OS
public static String uuid; // Device UUID public static String uuid; // Device UUID