You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/08/14 23:37:29 UTC
[01/12] git commit: [Windows8] added support for Windows8
Updated Branches:
refs/heads/dev 5aa28ae75 -> 6846cb04e (forced update)
[Windows8] added support for Windows8
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/fe35a3ce
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/fe35a3ce
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/fe35a3ce
Branch: refs/heads/dev
Commit: fe35a3ce65e74e694c6389162547dc43887170a8
Parents: 5d747c7
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Jul 29 19:04:44 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Jul 29 19:04:44 2013 -0700
----------------------------------------------------------------------
plugin.xml | 18 +++
src/windows8/CameraProxy.js | 341 +++++++++++++++++++++++++++++++++++++++
2 files changed, 359 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fe35a3ce/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 222aa65..1581a6e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,6 +5,7 @@
version="0.1.0">
<name>Camera</name>
+
<js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera" />
</js-module>
@@ -13,6 +14,8 @@
<clobbers target="CameraPopoverOptions" />
</js-module>
+
+
<js-module src="www/Camera.js" name="camera">
<clobbers target="navigator.camera" />
</js-module>
@@ -112,5 +115,20 @@
<clobbers target="CameraPopoverHandle" />
</js-module>
</platform>
+
+ <!-- windows8 -->
+ <platform name="windows8">
+
+ <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file" commit="master" subdir="/" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+
+ <js-module src="src/windows8/CameraProxy.js" name="CameraProxy">
+ <merges target="" />
+ </js-module>
+
+ </platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fe35a3ce/src/windows8/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/CameraProxy.js b/src/windows8/CameraProxy.js
new file mode 100644
index 0000000..7c45dc3
--- /dev/null
+++ b/src/windows8/CameraProxy.js
@@ -0,0 +1,341 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+/*global Windows:true, URL:true */
+
+
+var cordova = require('cordova'),
+ Camera = require('./Camera'),
+ FileEntry = require('org.apache.cordova.core.file.FileEntry'),
+ FileError = require('org.apache.cordova.core.file.FileError'),
+ FileReader = require('org.apache.cordova.core.file.FileReader');
+
+module.exports = {
+
+ // args will contain :
+ // ... it is an array, so be careful
+ // 0 quality:50,
+ // 1 destinationType:Camera.DestinationType.FILE_URI,
+ // 2 sourceType:Camera.PictureSourceType.CAMERA,
+ // 3 targetWidth:-1,
+ // 4 targetHeight:-1,
+ // 5 encodingType:Camera.EncodingType.JPEG,
+ // 6 mediaType:Camera.MediaType.PICTURE,
+ // 7 allowEdit:false,
+ // 8 correctOrientation:false,
+ // 9 saveToPhotoAlbum:false,
+ // 10 popoverOptions:null
+
+ takePicture: function (successCallback, errorCallback, args) {
+ var encodingType = args[5];
+ var targetWidth = args[3];
+ var targetHeight = args[4];
+ var sourceType = args[2];
+ var destinationType = args[1];
+ var mediaType = args[6];
+ var saveToPhotoAlbum = args[9];
+
+ var pkg = Windows.ApplicationModel.Package.current;
+ var packageId = pkg.installedLocation;
+
+ var fail = function (fileError) {
+ errorCallback("FileError, code:" + fileError.code);
+ };
+
+ // resize method :)
+ var resizeImage = function (file) {
+ var tempPhotoFileName = "";
+ if (encodingType == Camera.EncodingType.PNG) {
+ tempPhotoFileName = "camera_cordova_temp_return.png";
+ } else {
+ tempPhotoFileName = "camera_cordova_temp_return.jpg";
+ }
+ var imgObj = new Image();
+ var success = function (fileEntry) {
+ var successCB = function (filePhoto) {
+ var fileType = file.contentType,
+ reader = new FileReader();
+ reader.onloadend = function () {
+ var image = new Image();
+ image.src = reader.result;
+ image.onload = function () {
+ var imageWidth = targetWidth,
+ imageHeight = targetHeight;
+ var canvas = document.createElement('canvas');
+
+ canvas.width = imageWidth;
+ canvas.height = imageHeight;
+
+ var ctx = canvas.getContext("2d");
+ ctx.drawImage(this, 0, 0, imageWidth, imageHeight);
+
+ // The resized file ready for upload
+ var _blob = canvas.msToBlob();
+ var _stream = _blob.msDetachStream();
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ storageFolder.createFileAsync(tempPhotoFileName, Windows.Storage.CreationCollisionOption.generateUniqueName).done(function (file) {
+ file.openAsync(Windows.Storage.FileAccessMode.readWrite).done(function (fileStream) {
+ Windows.Storage.Streams.RandomAccessStream.copyAndCloseAsync(_stream, fileStream).done(function () {
+ var _imageUrl = URL.createObjectURL(file);
+ successCallback(_imageUrl);
+ }, function () { errorCallback("Resize picture error."); });
+ }, function () { errorCallback("Resize picture error."); });
+ }, function () { errorCallback("Resize picture error."); });
+ });
+ };
+ };
+
+ reader.readAsDataURL(filePhoto);
+ };
+
+ var failCB = function () {
+ errorCallback("File not found.");
+ };
+ fileEntry.file(successCB, failCB);
+ };
+
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) {
+ success(new FileEntry(storageFile.name, storageFile.path));
+ }, function () {
+ fail(FileError.INVALID_MODIFICATION_ERR);
+ }, function () {
+ errorCallback("Folder not access.");
+ });
+ });
+
+ };
+
+ // because of asynchronous method, so let the successCallback be called in it.
+ var resizeImageBase64 = function (file) {
+ var imgObj = new Image();
+ var success = function (fileEntry) {
+ var successCB = function (filePhoto) {
+ var fileType = file.contentType,
+ reader = new FileReader();
+ reader.onloadend = function () {
+ var image = new Image();
+ image.src = reader.result;
+
+ image.onload = function () {
+ var imageWidth = targetWidth,
+ imageHeight = targetHeight;
+ var canvas = document.createElement('canvas');
+
+ canvas.width = imageWidth;
+ canvas.height = imageHeight;
+
+ var ctx = canvas.getContext("2d");
+ ctx.drawImage(this, 0, 0, imageWidth, imageHeight);
+
+ // The resized file ready for upload
+ var finalFile = canvas.toDataURL(fileType);
+
+ // Remove the prefix such as "data:" + contentType + ";base64," , in order to meet the Cordova API.
+ var arr = finalFile.split(",");
+ var newStr = finalFile.substr(arr[0].length + 1);
+ successCallback(newStr);
+ };
+ };
+
+ reader.readAsDataURL(filePhoto);
+
+ };
+ var failCB = function () {
+ errorCallback("File not found.");
+ };
+ fileEntry.file(successCB, failCB);
+ };
+
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) {
+ success(new FileEntry(storageFile.name, storageFile.path));
+ }, function () {
+ fail(FileError.INVALID_MODIFICATION_ERR);
+ }, function () {
+ errorCallback("Folder not access.");
+ });
+ });
+
+ };
+
+ if (sourceType != Camera.PictureSourceType.CAMERA) {
+ var fileOpenPicker = new Windows.Storage.Pickers.FileOpenPicker();
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
+ if (mediaType == Camera.MediaType.PICTURE) {
+ fileOpenPicker.fileTypeFilter.replaceAll([".png", ".jpg", ".jpeg"]);
+ } else if (mediaType == Camera.MediaType.VIDEO) {
+ fileOpenPicker.fileTypeFilter.replaceAll([".avi", ".flv", ".asx", ".asf", ".mov", ".mp4", ".mpg", ".rm", ".srt", ".swf", ".wmv", ".vob"]);
+ } else {
+ fileOpenPicker.fileTypeFilter.replaceAll(["*"]);
+ }
+
+ fileOpenPicker.pickSingleFileAsync().then(function (file) {
+ if (file) {
+ if (destinationType == Camera.DestinationType.FILE_URI) {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImage(file);
+ } else {
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) {
+ var _imageUrl = URL.createObjectURL(storageFile);
+ successCallback(_imageUrl);
+ }, function () {
+ fail(FileError.INVALID_MODIFICATION_ERR);
+ }, function () {
+ errorCallback("Folder not access.");
+ });
+ });
+
+ }
+ }
+ else {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImageBase64(file);
+ } else {
+ Windows.Storage.FileIO.readBufferAsync(file).done(function (buffer) {
+ var strBase64 = Windows.Security.Cryptography.CryptographicBuffer.encodeToBase64String(buffer);
+ successCallback(strBase64);
+ });
+ }
+
+ }
+
+ } else {
+ errorCallback("User didn't choose a file.");
+ }
+ }, function () {
+ errorCallback("User didn't choose a file.");
+ });
+ }
+ else {
+
+ var cameraCaptureUI = new Windows.Media.Capture.CameraCaptureUI();
+ cameraCaptureUI.photoSettings.allowCropping = true;
+ var allowCrop = !!args[7];
+ if (!allowCrop) {
+ cameraCaptureUI.photoSettings.allowCropping = false;
+ }
+
+ if (encodingType == Camera.EncodingType.PNG) {
+ cameraCaptureUI.photoSettings.format = Windows.Media.Capture.CameraCaptureUIPhotoFormat.png;
+ } else {
+ cameraCaptureUI.photoSettings.format = Windows.Media.Capture.CameraCaptureUIPhotoFormat.jpeg;
+ }
+ // decide which max pixels should be supported by targetWidth or targetHeight.
+ if (targetWidth >= 1280 || targetHeight >= 960) {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.large3M;
+ } else if (targetWidth >= 1024 || targetHeight >= 768) {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.mediumXga;
+ } else if (targetWidth >= 800 || targetHeight >= 600) {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.mediumXga;
+ } else if (targetWidth >= 640 || targetHeight >= 480) {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.smallVga;
+ } else if (targetWidth >= 320 || targetHeight >= 240) {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.verySmallQvga;
+ } else {
+ cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.highestAvailable;
+ }
+
+ cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.photo).then(function (picture) {
+ if (picture) {
+ // save to photo album successCallback
+ var success = function (fileEntry) {
+ if (destinationType == Camera.DestinationType.FILE_URI) {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImage(picture);
+ } else {
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ picture.copyAsync(storageFolder, picture.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) {
+ var _imageUrl = URL.createObjectURL(storageFile);
+ successCallback(_imageUrl);
+ }, function () {
+ fail(FileError.INVALID_MODIFICATION_ERR);
+ }, function () {
+ errorCallback("Folder not access.");
+ });
+ });
+ }
+ } else {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImageBase64(picture);
+ } else {
+ Windows.Storage.FileIO.readBufferAsync(picture).done(function (buffer) {
+ var strBase64 = Windows.Security.Cryptography.CryptographicBuffer.encodeToBase64String(buffer);
+ successCallback(strBase64);
+ });
+ }
+ }
+ };
+ // save to photo album errorCallback
+ var fail = function () {
+ //errorCallback("FileError, code:" + fileError.code);
+ errorCallback("Save fail.");
+ };
+
+ if (saveToPhotoAlbum) {
+ Windows.Storage.StorageFile.getFileFromPathAsync(picture.path).then(function (storageFile) {
+ storageFile.copyAsync(Windows.Storage.KnownFolders.picturesLibrary, picture.name, Windows.Storage.NameCollisionOption.generateUniqueName).then(function (storageFile) {
+ success(storageFile);
+ }, function () {
+ fail();
+ });
+ });
+ //var directory = new DirectoryEntry("Pictures", parentPath);
+ //new FileEntry(picture.name, picture.path).copyTo(directory, null, success, fail);
+ } else {
+ if (destinationType == Camera.DestinationType.FILE_URI) {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImage(picture);
+ } else {
+ Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) {
+ picture.copyAsync(storageFolder, picture.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) {
+ var _imageUrl = URL.createObjectURL(storageFile);
+ successCallback(_imageUrl);
+ }, function () {
+ fail(FileError.INVALID_MODIFICATION_ERR);
+ }, function () {
+ errorCallback("Folder not access.");
+ });
+ });
+ }
+ } else {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImageBase64(picture);
+ } else {
+ Windows.Storage.FileIO.readBufferAsync(picture).done(function (buffer) {
+ var strBase64 = Windows.Security.Cryptography.CryptographicBuffer.encodeToBase64String(buffer);
+ successCallback(strBase64);
+ });
+ }
+ }
+ }
+ } else {
+ errorCallback("User didn't capture a photo.");
+ }
+ }, function () {
+ errorCallback("Fail to capture a photo.");
+ });
+ }
+ }
+};
+
+require("cordova/commandProxy").add("Camera",module.exports);
[04/12] git commit: [plugin.xml] standardizing license + meta
Posted by st...@apache.org.
[plugin.xml] standardizing license + meta
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/16f141ab
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/16f141ab
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/16f141ab
Branch: refs/heads/dev
Commit: 16f141ab453128e4875bb25aa55f385c111370b0
Parents: 033999b
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:52:52 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:52:52 2013 -0700
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/16f141ab/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index fd62552..8e53d50 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,7 +5,7 @@
version="0.1.0">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
- <license>Apache</license>
+ <license>Apache 2.0</license>
<keywords>cordova,camera</keywords>
[08/12] git commit: [CB-3482] Allow image metadata to be saved to
album on iOS
Posted by st...@apache.org.
[CB-3482] Allow image metadata to be saved to album on iOS
-pass in metadata when saving to album using ALAssetsLibrary
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/b702aaf4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/b702aaf4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/b702aaf4
Branch: refs/heads/dev
Commit: b702aaf440c9c8ee0bd361e5dda5c7cc0a4a4476
Parents: 5f98661
Author: James Jong <wj...@gmail.com>
Authored: Fri Aug 9 10:09:42 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 13:10:24 2013 -0700
----------------------------------------------------------------------
src/ios/CDVCamera.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/b702aaf4/src/ios/CDVCamera.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index ebef288..e0f195f 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -675,7 +675,8 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
if (self.pickerController.saveToPhotoAlbum) {
- UIImageWriteToSavedPhotosAlbum([UIImage imageWithData:[self data]], nil, nil, nil);
+ ALAssetsLibrary *library = [ALAssetsLibrary new];
+ [library writeImageDataToSavedPhotosAlbum:self.data metadata:self.metadata completionBlock:nil];
}
if (self.pickerController.returnType == DestinationTypeFileUri) {
[03/12] git commit: [license] adding apache license file
Posted by st...@apache.org.
[license] adding apache license file
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/033999b9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/033999b9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/033999b9
Branch: refs/heads/dev
Commit: 033999b9349644c90b086d2453f57ba407a4b08d
Parents: c1935df
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:42:09 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:42:09 2013 -0700
----------------------------------------------------------------------
LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 202 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/033999b9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
[07/12] git commit: [CB-3482] Allow image metadata to be saved to
album on iOS
Posted by st...@apache.org.
[CB-3482] Allow image metadata to be saved to album on iOS
-pass in metadata when saving to album using ALAssetsLibrary
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/3b0538c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/3b0538c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/3b0538c3
Branch: refs/heads/dev
Commit: 3b0538c3b1621ce00c53afa9646ef15c527b0147
Parents: 767e064
Author: James Jong <wj...@gmail.com>
Authored: Fri Aug 9 10:09:42 2013 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Fri Aug 9 10:09:42 2013 -0400
----------------------------------------------------------------------
src/ios/CDVCamera.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/3b0538c3/src/ios/CDVCamera.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index ebef288..e0f195f 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -675,7 +675,8 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
if (self.pickerController.saveToPhotoAlbum) {
- UIImageWriteToSavedPhotosAlbum([UIImage imageWithData:[self data]], nil, nil, nil);
+ ALAssetsLibrary *library = [ALAssetsLibrary new];
+ [library writeImageDataToSavedPhotosAlbum:self.data metadata:self.metadata completionBlock:nil];
}
if (self.pickerController.returnType == DestinationTypeFileUri) {
[09/12] git commit: [CB-3453] Save original picture to photo library
Posted by st...@apache.org.
[CB-3453] Save original picture to photo library
- saves original picture when the following camera options are set for no edits (i.e. allowEdit is false, correctOrientation is false, targetWidth/targetHeight are not specified)
- this mirrors cordova-android behavior
- testing done with mobile-spec auto and manual tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/5f98661e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/5f98661e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/5f98661e
Branch: refs/heads/dev
Commit: 5f98661e0d90a26494b1bb7d82d9ce117facc9dd
Parents: 73f9af5
Author: James Jong <wj...@gmail.com>
Authored: Thu Aug 8 15:01:59 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 13:10:24 2013 -0700
----------------------------------------------------------------------
src/ios/CDVCamera.m | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/5f98661e/src/ios/CDVCamera.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index 11662ed..ebef288 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -303,11 +303,16 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
NSData* data = nil;
+ // returnedImage is the image that is returned to caller and (optionally) saved to photo album
+ UIImage* returnedImage = (scaledImage == nil ? image : scaledImage);
if (cameraPicker.encodingType == EncodingTypePNG) {
- data = UIImagePNGRepresentation(scaledImage == nil ? image : scaledImage);
+ data = UIImagePNGRepresentation(returnedImage);
+ } else if ((cameraPicker.allowsEditing==false) && (cameraPicker.targetSize.width <= 0) && (cameraPicker.targetSize.height <= 0) && (cameraPicker.correctOrientation==false)){
+ // use image unedited as requested , don't resize
+ data = UIImageJPEGRepresentation(returnedImage, 1.0);
} else {
- data = UIImageJPEGRepresentation(scaledImage == nil ? image : scaledImage, cameraPicker.quality / 100.0f);
+ data = UIImageJPEGRepresentation(returnedImage, cameraPicker.quality / 100.0f);
NSDictionary *controllerMetadata = [info objectForKey:@"UIImagePickerControllerMediaMetadata"];
if (controllerMetadata) {
@@ -323,7 +328,8 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
if (cameraPicker.saveToPhotoAlbum) {
- UIImageWriteToSavedPhotosAlbum([UIImage imageWithData:data], nil, nil, nil);
+ ALAssetsLibrary *library = [ALAssetsLibrary new];
+ [library writeImageToSavedPhotosAlbum:returnedImage.CGImage orientation:(ALAssetOrientation)(returnedImage.imageOrientation) completionBlock:nil];
}
if (cameraPicker.returnType == DestinationTypeFileUri) {
[10/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera
Posted by st...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/7aa8aa8b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/7aa8aa8b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/7aa8aa8b
Branch: refs/heads/dev
Commit: 7aa8aa8b575746d7ffcc5e8c9ca8ff930ac21d9c
Parents: b702aaf 3b0538c
Author: Steven Gill <st...@gmail.com>
Authored: Wed Aug 14 13:10:29 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 13:10:29 2013 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/12] git commit: [plugin.xml] adding android namespace
Posted by st...@apache.org.
[plugin.xml] adding android namespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/73f9af5b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/73f9af5b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/73f9af5b
Branch: refs/heads/dev
Commit: 73f9af5b84022bdc017814eaceeb38fb913ba775
Parents: 16f141a
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 15:34:27 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 15:34:27 2013 -0700
----------------------------------------------------------------------
plugin.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/73f9af5b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 8e53d50..52803e2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
+xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.camera"
version="0.1.0">
<name>Camera</name>
[12/12] git commit: [CB-4417] Move cordova-plugin-camera to its own
Java package.
Posted by st...@apache.org.
[CB-4417] Move cordova-plugin-camera to its own Java package.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/6846cb04
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/6846cb04
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/6846cb04
Branch: refs/heads/dev
Commit: 6846cb04e3a78ff3bddf169d1be85e088fb74cb7
Parents: f44bdf7
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jul 31 19:57:24 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 14:37:25 2013 -0700
----------------------------------------------------------------------
plugin.xml | 4 ++--
src/android/CameraLauncher.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/6846cb04/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 0c8ba83..9c5cb7b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -27,14 +27,14 @@
<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
<feature name="Camera">
- <param name="android-package" value="org.apache.cordova.core.CameraLauncher"/>
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
</feature>
</config-file>
<config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</config-file>
- <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/core" />
+ <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/6846cb04/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 219479d..bd50a63 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.cordova.core;
+package org.apache.cordova.camera;
import java.io.ByteArrayOutputStream;
import java.io.File;
[06/12] git commit: [CB-3453] Save original picture to photo library
Posted by st...@apache.org.
[CB-3453] Save original picture to photo library
- saves original picture when the following camera options are set for no edits (i.e. allowEdit is false, correctOrientation is false, targetWidth/targetHeight are not specified)
- this mirrors cordova-android behavior
- testing done with mobile-spec auto and manual tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/767e064c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/767e064c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/767e064c
Branch: refs/heads/dev
Commit: 767e064c01d224b4159dcb292017c8db521afc67
Parents: c1935df
Author: James Jong <wj...@gmail.com>
Authored: Thu Aug 8 15:01:59 2013 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Thu Aug 8 15:01:59 2013 -0400
----------------------------------------------------------------------
src/ios/CDVCamera.m | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/767e064c/src/ios/CDVCamera.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index 11662ed..ebef288 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -303,11 +303,16 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
NSData* data = nil;
+ // returnedImage is the image that is returned to caller and (optionally) saved to photo album
+ UIImage* returnedImage = (scaledImage == nil ? image : scaledImage);
if (cameraPicker.encodingType == EncodingTypePNG) {
- data = UIImagePNGRepresentation(scaledImage == nil ? image : scaledImage);
+ data = UIImagePNGRepresentation(returnedImage);
+ } else if ((cameraPicker.allowsEditing==false) && (cameraPicker.targetSize.width <= 0) && (cameraPicker.targetSize.height <= 0) && (cameraPicker.correctOrientation==false)){
+ // use image unedited as requested , don't resize
+ data = UIImageJPEGRepresentation(returnedImage, 1.0);
} else {
- data = UIImageJPEGRepresentation(scaledImage == nil ? image : scaledImage, cameraPicker.quality / 100.0f);
+ data = UIImageJPEGRepresentation(returnedImage, cameraPicker.quality / 100.0f);
NSDictionary *controllerMetadata = [info objectForKey:@"UIImagePickerControllerMediaMetadata"];
if (controllerMetadata) {
@@ -323,7 +328,8 @@ static NSSet* org_apache_cordova_validArrowDirections;
}
if (cameraPicker.saveToPhotoAlbum) {
- UIImageWriteToSavedPhotosAlbum([UIImage imageWithData:data], nil, nil, nil);
+ ALAssetsLibrary *library = [ALAssetsLibrary new];
+ [library writeImageToSavedPhotosAlbum:returnedImage.CGImage orientation:(ALAssetOrientation)(returnedImage.imageOrientation) completionBlock:nil];
}
if (cameraPicker.returnType == DestinationTypeFileUri) {
[11/12] git commit: updated namespace, name tag and readme
Posted by st...@apache.org.
updated namespace, name tag and readme
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/f44bdf74
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/f44bdf74
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/f44bdf74
Branch: refs/heads/dev
Commit: f44bdf747858342922d3175adc61915705a17cb7
Parents: 7aa8aa8
Author: Steven Gill <st...@gmail.com>
Authored: Wed Jul 24 10:54:20 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 14:37:25 2013 -0700
----------------------------------------------------------------------
README.md | 2 +-
plugin.xml | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/f44bdf74/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ca2d7cd..983346d 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@ cordova-plugin-camera
==========================
To install this plugin, follow the [Command-line Interface Guide](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface).
-If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/guide_plugin_ref_plugman.md.html).
+If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/plugin_ref_plugman.md.html).
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/f44bdf74/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 52803e2..0c8ba83 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
-xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.core.camera"
- version="0.1.0">
- <name>Camera</name>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ id="org.apache.cordova.core.camera"
+ version="0.1.0">
+ <name>camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova,camera</keywords>
-
<js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera" />
</js-module>
[02/12] git commit: updating plugin.xml with registry data
Posted by st...@apache.org.
updating plugin.xml with registry data
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/c1935df8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/c1935df8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/c1935df8
Branch: refs/heads/dev
Commit: c1935df8df36439a8bdf80de7f2ef784210487a2
Parents: fe35a3c
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jul 30 15:31:58 2013 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jul 30 15:31:58 2013 -0700
----------------------------------------------------------------------
plugin.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/c1935df8/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 1581a6e..fd62552 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,6 +4,9 @@
id="org.apache.cordova.core.camera"
version="0.1.0">
<name>Camera</name>
+ <description>Cordova Camera Plugin</description>
+ <license>Apache</license>
+ <keywords>cordova,camera</keywords>
<js-module src="www/CameraConstants.js" name="Camera">