Incrementing project to 1.7.0rc1

This commit is contained in:
Joe Bowser 2012-04-23 11:37:33 -07:00 committed by macdonst
parent d7c8bc799d
commit 39f261c6e2
5 changed files with 188 additions and 236 deletions

View File

@ -1 +1 @@
1.6.1
1.7.0rc1

View File

@ -5,7 +5,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>PhoneGap</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
<script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
<script type="text/javascript" charset="utf-8" src="cordova-1.7.0rc1.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>

View File

@ -1,6 +1,6 @@
// commit b2de4baa76a94ecb916619a536339ffee9ef6843
// commit 017a948047e355ae0c2cdc8c4188ae57b115528a
// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
// File generated at :: Mon Apr 23 2012 11:36:23 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@ -67,10 +67,20 @@ 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');
/**
* Listen for DOMContentLoaded and notify our channel subscribers.
*/
document.addEventListener('DOMContentLoaded', function() {
channel.onDOMContentLoaded.fire();
}, false);
if (document.readyState == 'complete') {
channel.onDOMContentLoaded.fire();
}
/**
* Intercept calls to addEventListener + removeEventListener and handle deviceready,
* resume, and pause events.
@ -116,8 +126,13 @@ window.addEventListener = function(evt, handler, capture) {
document.removeEventListener = function(evt, handler, capture) {
var e = evt.toLowerCase();
// Check for pause/resume events first.
if (e == 'resume') {
channel.onResume.unsubscribe(handler);
} else if (e == 'pause') {
channel.onPause.unsubscribe(handler);
// If unsubcribing from an event that is handled by a plugin
if (typeof documentEventHandlers[e] != "undefined") {
} else if (typeof documentEventHandlers[e] != "undefined") {
documentEventHandlers[e].unsubscribe(handler);
} else {
m_document_removeEventListener.call(document, evt, handler, capture);
@ -326,6 +341,8 @@ module.exports = cordova;
// file: lib/common/builder.js
define("cordova/builder", function(require, exports, module) {
var utils = require('cordova/utils');
function each(objects, func, context) {
for (var prop in objects) {
if (objects.hasOwnProperty(prop)) {
@ -656,7 +673,6 @@ channel.waitForInitialization('onCordovaInfoReady');
channel.waitForInitialization('onCordovaConnectionReady');
module.exports = channel;
});
// file: lib/common/common.js
@ -841,7 +857,6 @@ module.exports = {
}
}
};
});
// file: lib/android/exec.js
@ -873,7 +888,8 @@ module.exports = function(success, fail, service, action, args) {
// If a result was returned
if (r.length > 0) {
eval("var v="+r+";");
var v;
eval("v="+r+";");
// If status is OK, then return value back to caller
if (v.status === cordova.callbackStatus.OK) {
@ -1077,7 +1093,6 @@ module.exports = {
}
}
};
});
// file: lib/common/plugin/Acceleration.js
@ -1090,7 +1105,6 @@ var Acceleration = function(x, y, z, timestamp) {
};
module.exports = Acceleration;
});
// file: lib/common/plugin/Camera.js
@ -1197,10 +1211,9 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
}
exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
}
};
module.exports = cameraExport;
});
// file: lib/common/plugin/CameraConstants.js
@ -1225,7 +1238,6 @@ module.exports = {
SAVEDPHOTOALBUM : 2 // Choose image from picture library (same as PHOTOLIBRARY for Android)
}
};
});
// file: lib/common/plugin/CaptureAudioOptions.js
@ -1243,7 +1255,6 @@ var CaptureAudioOptions = function(){
};
module.exports = CaptureAudioOptions;
});
// file: lib/common/plugin/CaptureError.js
@ -1267,7 +1278,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
CaptureError.CAPTURE_NOT_SUPPORTED = 20;
module.exports = CaptureError;
});
// file: lib/common/plugin/CaptureImageOptions.js
@ -1283,7 +1293,6 @@ var CaptureImageOptions = function(){
};
module.exports = CaptureImageOptions;
});
// file: lib/common/plugin/CaptureVideoOptions.js
@ -1301,7 +1310,6 @@ var CaptureVideoOptions = function(){
};
module.exports = CaptureVideoOptions;
});
// file: lib/common/plugin/CompassError.js
@ -1319,7 +1327,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
CompassError.COMPASS_NOT_SUPPORTED = 20;
module.exports = CompassError;
});
// file: lib/common/plugin/CompassHeading.js
@ -1332,7 +1339,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
};
module.exports = CompassHeading;
});
// file: lib/common/plugin/ConfigurationData.js
@ -1352,7 +1358,6 @@ function ConfigurationData() {
}
module.exports = ConfigurationData;
});
// file: lib/common/plugin/Connection.js
@ -1369,7 +1374,6 @@ module.exports = {
CELL_4G: "4g",
NONE: "none"
};
});
// file: lib/common/plugin/Contact.js
@ -1390,7 +1394,7 @@ function convertIn(contact) {
console.log("Cordova Contact convertIn error: exception creating date.");
}
return contact;
};
}
/**
* Converts Complex objects into primitives
@ -1399,7 +1403,7 @@ function convertIn(contact) {
function convertOut(contact) {
var value = contact.birthday;
if (value != null) {
if (value !== null) {
// try to make it a Date object if it is not already
if (!value instanceof Date){
try {
@ -1414,7 +1418,7 @@ function convertOut(contact) {
contact.birthday = value;
}
return contact;
};
}
/**
* Contains information about a single contact.
@ -1551,7 +1555,6 @@ Contact.prototype.save = function(successCB, errorCB) {
module.exports = Contact;
});
// file: lib/common/plugin/ContactAddress.js
@ -1581,7 +1584,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
};
module.exports = ContactAddress;
});
// file: lib/common/plugin/ContactError.js
@ -1607,7 +1609,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
ContactError.PERMISSION_DENIED_ERROR = 20;
module.exports = ContactError;
});
// file: lib/common/plugin/ContactField.js
@ -1628,7 +1629,6 @@ var ContactField = function(type, value, pref) {
};
module.exports = ContactField;
});
// file: lib/common/plugin/ContactFindOptions.js
@ -1646,7 +1646,6 @@ var ContactFindOptions = function(filter, multiple) {
};
module.exports = ContactFindOptions;
});
// file: lib/common/plugin/ContactName.js
@ -1671,7 +1670,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
};
module.exports = ContactName;
});
// file: lib/common/plugin/ContactOrganization.js
@ -1699,7 +1697,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
};
module.exports = ContactOrganization;
});
// file: lib/common/plugin/Coordinates.js
@ -1747,7 +1744,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
};
module.exports = Coordinates;
});
// file: lib/common/plugin/DirectoryEntry.js
@ -1755,6 +1751,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
var utils = require('cordova/utils'),
exec = require('cordova/exec'),
Entry = require('cordova/plugin/Entry'),
FileError = require('cordova/plugin/FileError'),
DirectoryReader = require('cordova/plugin/DirectoryReader');
/**
@ -1837,7 +1834,8 @@ module.exports = DirectoryEntry;
// file: lib/common/plugin/DirectoryReader.js
define("cordova/plugin/DirectoryReader", function(require, exports, module) {
var exec = require('cordova/exec');
var exec = require('cordova/exec'),
FileError = require('cordova/plugin/FileError') ;
/**
* An interface that lists the files and directories in a directory.
@ -1858,10 +1856,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
for (var i=0; i<result.length; i++) {
var entry = null;
if (result[i].isDirectory) {
entry = new DirectoryEntry();
entry = new (require('cordova/plugin/DirectoryEntry'))();
}
else if (result[i].isFile) {
entry = new FileEntry();
entry = new (require('cordova/plugin/FileEntry'))();
}
entry.isDirectory = result[i].isDirectory;
entry.isFile = result[i].isFile;
@ -2086,7 +2084,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
};
module.exports = Entry;
});
// file: lib/common/plugin/File.js
@ -2109,7 +2106,6 @@ var File = function(name, fullPath, type, lastModifiedDate, size){
};
module.exports = File;
});
// file: lib/common/plugin/FileEntry.js
@ -2177,7 +2173,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
module.exports = FileEntry;
});
// file: lib/common/plugin/FileError.js
@ -2207,7 +2202,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
FileError.PATH_EXISTS_ERR = 12;
module.exports = FileError;
});
// file: lib/common/plugin/FileReader.js
@ -2461,7 +2455,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
};
module.exports = FileReader;
});
// file: lib/common/plugin/FileSystem.js
@ -2483,7 +2476,6 @@ var FileSystem = function(name, root) {
};
module.exports = FileSystem;
});
// file: lib/common/plugin/FileTransfer.js
@ -2542,10 +2534,10 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
var win = function(result) {
var entry = null;
if (result.isDirectory) {
entry = new DirectoryEntry();
entry = new (require('cordova/plugin/DirectoryEntry'))();
}
else if (result.isFile) {
entry = new FileEntry();
entry = new (require('cordova/plugin/FileEntry'))();
}
entry.isDirectory = result.isDirectory;
entry.isFile = result.isFile;
@ -2575,7 +2567,6 @@ FileTransferError.INVALID_URL_ERR = 2;
FileTransferError.CONNECTION_ERR = 3;
module.exports = FileTransferError;
});
// file: lib/common/plugin/FileUploadOptions.js
@ -2596,7 +2587,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
};
module.exports = FileUploadOptions;
});
// file: lib/common/plugin/FileUploadResult.js
@ -2612,13 +2602,12 @@ var FileUploadResult = function() {
};
module.exports = FileUploadResult;
});
// file: lib/common/plugin/FileWriter.js
define("cordova/plugin/FileWriter", function(require, exports, module) {
var exec = require('cordova/exec'),
FileError = require('cordova/plugin/FileError');
FileError = require('cordova/plugin/FileError'),
ProgressEvent = require('cordova/plugin/ProgressEvent');
/**
@ -2777,7 +2766,7 @@ FileWriter.prototype.seek = function(offset) {
throw new FileError(FileError.INVALID_STATE_ERR);
}
if (!offset && offset != 0) {
if (!offset && offset !== 0) {
return;
}
@ -2890,7 +2879,6 @@ function Flags(create, exclusive) {
}
module.exports = Flags;
});
// file: lib/common/plugin/LocalFileSystem.js
@ -2908,7 +2896,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
LocalFileSystem.PERSISTENT = 1; //persistent
module.exports = LocalFileSystem;
});
// file: lib/common/plugin/Media.js
@ -3100,7 +3087,6 @@ Media.onStatus = function(id, msg, value) {
};
module.exports = Media;
});
// file: lib/common/plugin/MediaError.js
@ -3121,7 +3107,6 @@ MediaError.MEDIA_ERR_DECODE = 3;
MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
module.exports = MediaError;
});
// file: lib/common/plugin/MediaFile.js
@ -3182,7 +3167,6 @@ MediaFile.cast = function(pluginResult) {
};
module.exports = MediaFile;
});
// file: lib/common/plugin/MediaFileData.js
@ -3205,7 +3189,6 @@ var MediaFileData = function(codecs, bitrate, height, width, duration){
};
module.exports = MediaFileData;
});
// file: lib/common/plugin/Metadata.js
@ -3220,7 +3203,6 @@ var Metadata = function(time) {
};
module.exports = Metadata;
});
// file: lib/common/plugin/Position.js
@ -3233,7 +3215,6 @@ var Position = function(coords, timestamp) {
};
module.exports = Position;
});
// file: lib/common/plugin/PositionError.js
@ -3255,7 +3236,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
PositionError.TIMEOUT = 3;
module.exports = PositionError;
});
// file: lib/common/plugin/ProgressEvent.js
@ -3306,7 +3286,6 @@ var ProgressEvent = (function() {
})();
module.exports = ProgressEvent;
});
// file: lib/common/plugin/accelerometer.js
@ -3406,7 +3385,6 @@ var accelerometer = {
};
module.exports = accelerometer;
});
// file: lib/android/plugin/android/app.js
@ -3482,7 +3460,6 @@ module.exports = {
return exec(null, null, "App", "exitApp", []);
}
};
});
// file: lib/android/plugin/android/callback.js
@ -3572,7 +3549,6 @@ var port = null,
};
module.exports = callback;
});
// file: lib/android/plugin/android/device.js
@ -3670,7 +3646,6 @@ Device.prototype.exitApp = function() {
};
module.exports = new Device();
});
// file: lib/android/plugin/android/notification.js
@ -3726,7 +3701,7 @@ module.exports = {
*/
progressValue : function(value) {
exec(null, null, 'Notification', 'progressValue', [ value ]);
},
}
};
});
@ -3765,13 +3740,12 @@ var cordova = require('cordova'),
};
module.exports = polling;
});
// file: lib/android/plugin/android/storage.js
define("cordova/plugin/android/storage", function(require, exports, module) {
var utils = require('cordova/utils'),
exec = require('cordova/exec');
exec = require('cordova/exec'),
channel = require('cordova/channel');
var queryQueue = {};
@ -4077,7 +4051,7 @@ var CupcakeLocalStorage = function() {
transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
for(var i = 0; i < result.rows.length; i++) {
storage[result.rows.item(i)['id']] = result.rows.item(i)['body'];
storage[result.rows.item(i).id] = result.rows.item(i).body;
}
setLength(result.rows.length);
channel.initializationComplete("cupcakeStorage");
@ -4239,7 +4213,6 @@ Battery.prototype._error = function(e) {
var battery = new Battery();
module.exports = battery;
});
// file: lib/common/plugin/capture.js
@ -4355,7 +4328,7 @@ var exec = require('cordova/exec'),
var fail = function(code) {
var ce = new CompassError(code);
errorCallback(ce);
}
};
// Get heading
exec(win, fail, "Compass", "getHeading", [options]);
@ -4422,7 +4395,6 @@ var exec = require('cordova/exec'),
};
module.exports = compass;
});
// file: lib/common/plugin/contacts.js
@ -4484,7 +4456,6 @@ var contacts = {
};
module.exports = contacts;
});
// file: lib/common/plugin/geolocation.js
@ -4583,7 +4554,6 @@ var geolocation = {
};
module.exports = geolocation;
});
// file: lib/common/plugin/network.js
@ -4648,7 +4618,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
};
module.exports = new NetworkConnection();
});
// file: lib/common/plugin/notification.js
@ -4709,7 +4678,6 @@ module.exports = {
exec(null, null, "Notification", "beep", [count]);
}
};
});
// file: lib/common/plugin/requestFileSystem.js
@ -4754,13 +4722,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
};
module.exports = requestFileSystem;
});
// file: lib/common/plugin/resolveLocalFileSystemURI.js
define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
FileEntry = require('cordova/plugin/FileEntry'),
FileError = require('cordova/plugin/FileError'),
exec = require('cordova/exec');
/**
@ -4909,7 +4877,6 @@ var _self = {
};
module.exports = _self;
});
@ -4920,20 +4887,6 @@ window.cordova = require('cordova');
var channel = require("cordova/channel"),
_self = {
boot: function () {
//---------------
// Event handling
//---------------
/**
* Listen for DOMContentLoaded and notify our channel subscribers.
*/
document.addEventListener('DOMContentLoaded', function() {
channel.onDOMContentLoaded.fire();
}, false);
if (document.readyState == 'complete') {
channel.onDOMContentLoaded.fire();
}
/**
* Create all cordova objects once page has fully loaded and native side is ready.
*/
@ -4983,5 +4936,4 @@ window.cordova = require('cordova');
}(window));
})();

View File

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

View File

@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin {
public static final String TAG = "Device";
public static String cordovaVersion = "1.6.1"; // Cordova version
public static String cordovaVersion = "1.7.0rc1"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID