diff --git a/VERSION b/VERSION index f8e233b2..4111d137 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.0 +2.0.0rc1 diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html index aa5336db..de219c60 100644 --- a/bin/templates/project/assets/www/index.html +++ b/bin/templates/project/assets/www/index.html @@ -23,7 +23,7 @@ PhoneGap - + diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js index 059f71ac..6020e013 100644 --- a/framework/assets/js/cordova.android.js +++ b/framework/assets/js/cordova.android.js @@ -1,6 +1,6 @@ -// commit 32e35b75c5ea2946dffebbc6cf4d0fbc16c0839e +// commit fd00bff18daf29606d88263f7586f20cf9421861 -// File generated at :: Thu Jul 12 2012 13:35:26 GMT-0700 (PDT) +// File generated at :: Fri Jul 13 2012 15:09:46 GMT-0700 (PDT) /* Licensed to the Apache Software Foundation (ASF) under one @@ -1286,7 +1286,10 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) { popoverOptions = options.popoverOptions; } - exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum, popoverOptions]); + var args = [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, + mediaType, allowEdit, correctOrientation, saveToPhotoAlbum, popoverOptions]; + + exec(successCallback, errorCallback, "Camera", "takePicture", args); }; cameraExport.cleanup = function(successCallback, errorCallback) { diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html index 358a04d5..9fbce688 100644 --- a/framework/assets/www/index.html +++ b/framework/assets/www/index.html @@ -19,7 +19,7 @@ - + diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java index 6190bf15..3ac219ef 100644 --- a/framework/src/org/apache/cordova/Device.java +++ b/framework/src/org/apache/cordova/Device.java @@ -38,7 +38,7 @@ import android.telephony.TelephonyManager; public class Device extends Plugin { public static final String TAG = "Device"; - public static String cordovaVersion = "1.9.0"; // Cordova version + public static String cordovaVersion = "2.0.0rc1"; // Cordova version public static String platform = "Android"; // Device OS public static String uuid; // Device UUID