public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-3584: Something went weird in the repo. This time for real.

Browse Source
This commit is contained in:
Joe Bowser 2013-06-04 13:59:48 -07:00
parent fbd6b559d4
commit b2b1ae2b33
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.8.0rc1 2.8.0

26
framework/assets/www/cordova.js vendored
View File

@ -1,5 +1,5 @@
// Platform: android // Platform: android
// 2.8.0rc1-0-g22bc4d8 // 2.8.0-0-g6208c95
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
@ -19,7 +19,7 @@
under the License. under the License.
*/ */
;(function() { ;(function() {
var CORDOVA_JS_BUILD_LABEL = '2.8.0rc1-0-g22bc4d8'; var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95';
// file: lib/scripts/require.js // file: lib/scripts/require.js
var require, var require,
@ -2396,11 +2396,7 @@ function initRead(reader, file) {
reader._error = null; reader._error = null;
reader._readyState = FileReader.LOADING; reader._readyState = FileReader.LOADING;
if (typeof file == 'string') { if (typeof file.fullPath == 'string') {
// Deprecated in Cordova 2.4.
console.warn('Using a string argument with FileReader.readAs functions is deprecated.');
reader._fileName = file;
} else if (typeof file.fullPath == 'string') {
reader._fileName = file.fullPath; reader._fileName = file.fullPath;
} else { } else {
reader._fileName = ''; reader._fileName = '';
@ -4071,6 +4067,10 @@ module.exports = {
// file: lib/android/plugin/android/nativeapiprovider.js // file: lib/android/plugin/android/nativeapiprovider.js
define("cordova/plugin/android/nativeapiprovider", function(require, exports, module) { define("cordova/plugin/android/nativeapiprovider", function(require, exports, module) {
/**
* Exports the ExposedJsApi.java object if available, otherwise exports the PromptBasedNativeApi.
*/
var nativeApi = this._cordovaNative || require('cordova/plugin/android/promptbasednativeapi'); var nativeApi = this._cordovaNative || require('cordova/plugin/android/promptbasednativeapi');
var currentApi = nativeApi; var currentApi = nativeApi;
@ -4149,6 +4149,11 @@ module.exports = {
// file: lib/android/plugin/android/promptbasednativeapi.js // file: lib/android/plugin/android/promptbasednativeapi.js
define("cordova/plugin/android/promptbasednativeapi", function(require, exports, module) { define("cordova/plugin/android/promptbasednativeapi", function(require, exports, module) {
/**
* Implements the API of ExposedJsApi.java, but uses prompt() to communicate.
* This is used only on the 2.3 simulator, where addJavascriptInterface() is broken.
*/
module.exports = { module.exports = {
exec: function(service, action, callbackId, argsJson) { exec: function(service, action, callbackId, argsJson) {
return prompt(argsJson, 'gap:'+JSON.stringify([service, action, callbackId])); return prompt(argsJson, 'gap:'+JSON.stringify([service, action, callbackId]));
@ -5072,7 +5077,6 @@ function Device() {
this.available = false; this.available = false;
this.platform = null; this.platform = null;
this.version = null; this.version = null;
this.name = null;
this.uuid = null; this.uuid = null;
this.cordova = null; this.cordova = null;
this.model = null; this.model = null;
@ -5088,7 +5092,6 @@ function Device() {
me.available = true; me.available = true;
me.platform = info.platform; me.platform = info.platform;
me.version = info.version; me.version = info.version;
me.name = info.name;
me.uuid = info.uuid; me.uuid = info.uuid;
me.cordova = buildLabel; me.cordova = buildLabel;
me.model = info.model; me.model = info.model;
@ -6676,6 +6679,11 @@ window.cordova = require('cordova');
// file: lib/scripts/bootstrap.js // file: lib/scripts/bootstrap.js
(function (context) { (function (context) {
if (context._cordovaJsLoaded) {
throw new Error('cordova.js included multiple times.');
}
context._cordovaJsLoaded = true;
var channel = require('cordova/channel'); var channel = require('cordova/channel');
var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady]; var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];