incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Tagging 2.0.0rc1
Date Fri, 13 Jul 2012 22:46:52 GMT
Updated Branches:
  refs/heads/master e0a5fe400 -> 9d5fb0b20
Updated Tags:  refs/tags/2.0.0rc1 [created] 9d5fb0b20


Tagging 2.0.0rc1


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/9d5fb0b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9d5fb0b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9d5fb0b2

Branch: refs/heads/master
Commit: 9d5fb0b2017889808e597a7dd691cc4d66b78cf9
Parents: e0a5fe4
Author: Joe Bowser <bowserj@apache.org>
Authored: Fri Jul 13 15:46:09 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Fri Jul 13 15:46:09 2012 -0700

----------------------------------------------------------------------
 VERSION                                      |    2 +-
 bin/templates/project/assets/www/index.html  |    2 +-
 framework/assets/js/cordova.android.js       |    9 ++++++---
 framework/assets/www/index.html              |    2 +-
 framework/src/org/apache/cordova/Device.java |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9d5fb0b2/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index f8e233b..4111d13 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.9.0
+2.0.0rc1

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9d5fb0b2/bin/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
index aa5336d..de219c6 100644
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -23,7 +23,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.9.0.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-2.0.0rc1.js"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9d5fb0b2/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 059f71a..6020e01 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) {

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9d5fb0b2/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 358a04d..9fbce68 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.9.0.js"></script>
+    <script src="cordova-2.0.0rc1.js"></script>
   </head>
   <body>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9d5fb0b2/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index 6190bf1..3ac219e 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
 


Mime
View raw message