You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/04/13 22:00:52 UTC
[3/5] android commit: Getting setup to tag 1.6.1
Getting setup to tag 1.6.1
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/eb48055a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/eb48055a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/eb48055a
Branch: refs/heads/CordovaWebView
Commit: eb48055acd18b33400286e5acb65a12c06c0a022
Parents: e4a52de
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Apr 12 16:37:27 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Apr 12 16:37:27 2012 -0700
----------------------------------------------------------------------
VERSION | 2 +-
.../templates/project/assets/www/index.html | 10 +++++-----
framework/assets/js/cordova.android.js | 4 +++-
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
5 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb48055a/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index dc1e644..9c6d629 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.0
+1.6.1
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb48055a/bin/templates/project/cordova/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
index 48b968d..1f4c50b 100644
--- a/bin/templates/project/cordova/templates/project/assets/www/index.html
+++ b/bin/templates/project/cordova/templates/project/assets/www/index.html
@@ -4,9 +4,9 @@
<meta name="viewport" content="width=320; user-scalable=no" />
<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.6.0"></script>
- <script type="text/javascript" charset="utf-8" src="main.js"></script>
+ <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
+ <script type="text/javascript" charset="utf-8" src="cordova-1.6.1"></script>
+ <script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>
<body onload="init();" id="stage" class="theme">
@@ -25,14 +25,14 @@
</dl>
<a href="#" class="btn large" onclick="toggleAccel();">Toggle Accelerometer</a>
<a href="#" class="btn large" onclick="getLocation();">Get Location</a>
- <a href="tel:411" class="btn large">Call 411</a>
+ <a href="tel:411" class="btn large">Call 411</a>
<a href="#" class="btn large" onclick="beep();">Beep</a>
<a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
<a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
<a href="#" class="btn large" onclick="get_contacts();return false;">Get Phone's Contacts</a>
<a href="#" class="btn large" onclick="check_network();return false;">Check Network</a>
<dl>
- <dt>Compass Heading:</dt><dd id="h">Off</dd>
+ <dt>Compass Heading:</dt><dd id="h">Off</dd>
</dl>
<a href="#" class="btn large" onclick="toggleCompass();return false;">Toggle Compass</a>
<div id="viewport" class="viewport" style="display: none;">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb48055a/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index a9a6b23..f0a811a 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,4 +1,6 @@
-// File generated at :: Wed Apr 11 2012 10:34:53 GMT-0400 (EDT)
+// commit 9451ff3c5517ba9ba4a2c062633686bb3a993f52
+
+// File generated at :: Thu Apr 12 2012 16:36:23 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb48055a/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index e6b8a7a..091d25f 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.6.0.js"></script>
+ <script src="cordova-1.6.1.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb48055a/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 c96c522..b8ced26 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.6.0"; // Cordova version
+ public static String cordovaVersion = "1.6.1"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID