Compare commits

...

4 Commits

Author SHA1 Message Date
Steve Gill
304599d809 Revert "CB-8747 updated dependency, added peer dependency"
This reverts commit d1dfc1e8ee9ac5bcaa329396eb003e4bcc432ddb.
2015-04-09 16:39:42 -07:00
Steve Gill
d82bad305b Merge branch 'master' into old-ID 2015-04-09 14:39:47 -07:00
Steve Gill
03a720808b Revert "CB-8683 updated blackberry specific references of org.apache.cordova.camera to cordova-plugin-camera"
This reverts commit ee4ac0d7b28fc638ad2a5abc2158dbc2997bf744.
2015-04-01 11:41:42 -07:00
Steve Gill
52a9d39855 Revert "CB-8683 changed plugin-id to pacakge-name"
This reverts commit f1ae0e9ccf99c210396f0001f49d3fcd2fe3de00.
2015-04-01 11:41:26 -07:00
5 changed files with 8 additions and 11 deletions

View File

@ -3,7 +3,7 @@
"version": "0.3.7-dev",
"description": "Cordova Camera Plugin",
"cordova": {
"id": "cordova-plugin-camera",
"id": "org.apache.cordova.camera",
"platforms": [
"firefoxos",
"android",
@ -38,9 +38,6 @@
"cordova-browser",
"cordova-windows"
],
"peerDependencies": {
"cordova-plugin-file": ">=1.0.1"
},
"author": "Apache Software Foundation",
"license": "Apache 2.0"
}

View File

@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:rim="http://www.blackberry.com/ns/widgets"
id="cordova-plugin-camera"
id="org.apache.cordova.camera"
version="0.3.7-dev">
<name>Camera</name>
<description>Cordova Camera Plugin</description>

View File

@ -60,7 +60,7 @@ function showCameraDialog (done, cancel, fail) {
});
wv.on('JavaScriptCallback', function (evt, data) {
var args = JSON.parse(data).args;
if (args[0] === 'cordova-plugin-camera') {
if (args[0] === 'org.apache.cordova.camera') {
if (args[1] === 'cancel') {
cancel('User canceled');
} else if (args[1] === 'error') {

View File

@ -21,12 +21,12 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:rim="http://www.blackberry.com/ns/widgets"
id="cordova-plugin-camera-tests"
id="org.apache.cordova.camera.tests"
version="0.3.7-dev">
<name>Cordova Camera Plugin Tests</name>
<license>Apache 2.0</license>
<dependency id="cordova-plugin-file" version=">=1.0.1" />
<dependency id="org.apache.cordova.file" version=">=1.0.1" />
<js-module src="tests.js" name="tests">
</js-module>

View File

@ -20,7 +20,7 @@
document.addEventListener('DOMContentLoaded', function () {
document.getElementById('back').onclick = function () {
window.qnx.callExtensionMethod('cordova-plugin-camera', 'cancel');
window.qnx.callExtensionMethod('org.apache.cordova.camera', 'cancel');
};
window.navigator.webkitGetUserMedia(
{ video: true },
@ -36,11 +36,11 @@ document.addEventListener('DOMContentLoaded', function () {
canvas.width = video.videoWidth;
canvas.height = video.videoHeight;
canvas.getContext('2d').drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
window.qnx.callExtensionMethod('cordova-plugin-camera', canvas.toDataURL('img/png'));
window.qnx.callExtensionMethod('org.apache.cordova.camera', canvas.toDataURL('img/png'));
};
},
function () {
window.qnx.callExtensionMethod('cordova-plugin-camera', 'error', 'getUserMedia failed');
window.qnx.callExtensionMethod('org.apache.cordova.camera', 'error', 'getUserMedia failed');
}
);
});