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

Merge branch 'next'

Browse Source
This commit is contained in:
Joe Bowser 2013-02-27 11:07:55 -08:00
commit 5d79d6e134
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.5.0rc1
2.5.0

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

@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p>
</div>
</div>
<script type="text/javascript" src="cordova-2.5.0rc1.js"></script>
<script type="text/javascript" src="cordova-2.5.0.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
app.initialize();

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

@ -1,8 +1,8 @@
// Platform: android
// commit 521bbd64ed729ca76b6646d25bb01b76ee8a54b5
// commit f50d20a87431c79a54572263729461883f611a53
// File generated at :: Wed Feb 20 2013 13:49:25 GMT-0800 (PST)
// File generated at :: Tue Feb 26 2013 13:37:51 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@ -1167,7 +1167,8 @@ define("cordova/plugin/Camera", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
Camera = require('cordova/plugin/CameraConstants');
Camera = require('cordova/plugin/CameraConstants'),
CameraPopoverHandle = require('cordova/plugin/CameraPopoverHandle');
var cameraExport = {};
@ -1207,6 +1208,7 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
mediaType, allowEdit, correctOrientation, saveToPhotoAlbum, popoverOptions];
exec(successCallback, errorCallback, "Camera", "takePicture", args);
return new CameraPopoverHandle();
};
cameraExport.cleanup = function(successCallback, errorCallback) {
@ -1251,6 +1253,24 @@ module.exports = {
});
// file: lib/common/plugin/CameraPopoverHandle.js
define("cordova/plugin/CameraPopoverHandle", function(require, exports, module) {
var exec = require('cordova/exec');
/**
* A handle to an image picker popover.
*/
var CameraPopoverHandle = function() {
this.setPosition = function(popoverOptions) {
console.log('CameraPopoverHandle.setPosition is only supported on iOS.');
};
};
module.exports = CameraPopoverHandle;
});
// file: lib/common/plugin/CameraPopoverOptions.js
define("cordova/plugin/CameraPopoverOptions", function(require, exports, module) {

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

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

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

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