Adding fix for CB-482

Automatically update index.html in templates directory on version change
CB-489 - Adding .js to the example, thought it was removed for a reason
2026-01-30 00:05:28 +08:00 · 2012-04-17 12:20:23 -07:00 · 2012-04-13 16:36:46 -04:00 · 2012-04-13 13:08:13 -07:00 · 2012-04-13 15:35:49 -04:00 · 2012-04-12 16:37:27 -07:00
10 changed files with 26 additions and 34 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-1.6.0
+1.6.1
--- a/bin/create
+++ b/bin/create
@@ -34,6 +34,10 @@ cp ./framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/.cordova/android/cor
 # copy in cordova.jar
 cp ./framework/cordova-$VERSION.jar $PROJECT_PATH/.cordova/android/cordova-$VERSION.jar

+# copy in res/xml
+cp ./framework/res/xml/cordova.xml $PROJECT_PATH/.cordova/android/cordova.xml
+cp ./framework/res/xml/plugins.xml $PROJECT_PATH/.cordova/android/plugins.xml
+
 # app properties
 cat > $PROJECT_PATH/.cordova/config <<eom
 VERSION=$VERSION
--- a/bin/templates/project/cordova/create
+++ b/bin/templates/project/cordova/create
@@ -25,6 +25,11 @@ cp ./.cordova/android/cordova-$VERSION.js ./assets/www
 # copy in cordova.jar
 cp ./.cordova/android/cordova-$VERSION.jar ./libs

+# copy in res/xml
+mkdir ./res/xml
+cp ./.cordova/android/cordova.xml ./res/xml
+cp ./.cordova/android/plugins.xml ./res/xml
+
 # copy in default activity
 cat ./cordova/templates/Activity.java > $ACTIVITY_PATH

--- 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.js"></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;">
--- a/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
+++ b/bin/templates/project/cordova/templates/project/res/xml/cordova.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cordova>
-    <access origin="http://127.0.0.1*"/>
-    <log level="DEBUG"/>
-</cordova>
--- a/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
+++ b/bin/templates/project/cordova/templates/project/res/xml/plugins.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<plugins>
-    <plugin name="App" value="org.apache.cordova.App"/>
-    <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
-    <plugin name="Device" value="org.apache.cordova.Device"/>
-    <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
-    <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
-    <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
-    <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
-    <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
-    <plugin name="File" value="org.apache.cordova.FileUtils"/>
-    <plugin name="Network Status" value="org.apache.cordova.NetworkManager"/>
-    <plugin name="Notification" value="org.apache.cordova.Notification"/>
-    <plugin name="Storage" value="org.apache.cordova.Storage"/>
-    <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
-    <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
-    <plugin name="Capture" value="org.apache.cordova.Capture"/>
-    <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
-</plugins>
--- 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 b2de4baa76a94ecb916619a536339ffee9ef6843
+
+// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)

 /*
 Licensed to the Apache Software Foundation (ASF) under one
@@ -1003,7 +1005,11 @@ module.exports = {
                    db = originalOpenDatabase(name, version, desc, size);
                } 
                catch (ex) {
-                    db = null;
+                    if (ex.code === 18) {
+                        db = null;
+                    } else {
+                        throw ex;
+                    }
                }

                if (db === null) {
--- 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>

--- a/framework/build.xml
+++ b/framework/build.xml
@@ -122,6 +122,7 @@
      <!-- update project files to reference cordova-x.x.x.min.js -->
      <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
         <fileset file="assets/www/index.html" /> 
+         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" /> 
      </replaceregexp>

      <!-- This is sketchy, but it works, ${dblQuote} does not -->
--- 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
Author	SHA1	Message	Date
Joe Bowser	c341cf0d47	Adding fix for CB-482	2012-04-17 12:20:23 -07:00
macdonst	f2c38ea0a7	Automatically update index.html in templates directory on version change	2012-04-13 16:36:46 -04:00
Joe Bowser	0772a315c4	CB-489 - Adding .js to the example, thought it was removed for a reason	2012-04-13 13:08:13 -07:00
macdonst	08d7a9c87a	Remove duplicate files from repository We should only have these files in one place in the repo. Changes have been made to the scripts to pick up the xml files from their proper location.	2012-04-13 15:35:49 -04:00
Joe Bowser	eb48055acd	Getting setup to tag 1.6.1	2012-04-12 16:37:27 -07:00
Joe Bowser	e4a52de0a5	Copying new XML into the templates for 1.6.1. Turns out tags are broken	2012-04-12 14:33:29 -07:00
@@ -1 +1 @@
 .6.0
 .6.1