Updating JS for Android

Prep for 2.7.0 final
Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.7.x
2013-04-25 14:55:11 -07:00 · 2013-04-25 13:42:20 -07:00 · 2013-04-25 10:20:07 -07:00 · 2013-04-25 10:19:48 -07:00 · 2013-04-25 13:11:02 -04:00 · 2013-04-19 17:56:26 -07:00
6 changed files with 12 additions and 13 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-2.6.0
+2.7.0
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@ -33,7 +33,7 @@
                <p class="event received">Device is Ready</p>
            </div>
        </div>
-        <script type="text/javascript" src="cordova-2.6.0.js"></script>
+        <script type="text/javascript" src="cordova-2.7.0.js"></script>
        <script type="text/javascript" src="js/index.js"></script>
        <script type="text/javascript">
            app.initialize();
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@ -1,8 +1,8 @@
 // Platform: android

-// commit d0ffb852378ff018bac2f3b12c38098a19b8ce00
+// commit cd29cf0f224ccf25e9d422a33fd02ef67d3a78f4

-// File generated at :: Thu Apr 18 2013 15:10:54 GMT-0400 (EDT)
+// File generated at :: Thu Apr 25 2013 14:53:10 GMT-0700 (PDT)

 /*
 Licensed to the Apache Software Foundation (ASF) under one
@ -6813,7 +6813,7 @@ require('cordova/channel').onNativeReady.fire();
        xhr.onload = function() {
            // If the response is a JSON string which composes an array, call handlePluginsObject.
            // If the request fails, or the response is not a JSON array, just call finishPluginLoading.
-            var obj = JSON.parse(this.responseText);
+            var obj = this.responseText && JSON.parse(this.responseText);
            if (obj && obj instanceof Array && obj.length > 0) {
                handlePluginsObject(obj);
            } else {
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@ -19,7 +19,7 @@
 <html>
  <head>
    <title></title>
-    <script src="cordova-2.6.0.js"></script>
+    <script src="cordova-2.7.0.js"></script>
  </head>
  <body>

--- 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 CordovaPlugin {
    public static final String TAG = "Device";

-    public static String cordovaVersion = "2.6.0";              // Cordova version
+    public static String cordovaVersion = "2.7.0";              // Cordova version
    public static String platform = "Android";                  // Device OS
    public static String uuid;                                  // Device UUID

--- a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
@ -43,13 +43,12 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {

    @Override
    public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
-        if(url.contains("?") || url.contains("#") || needsIceCreamSpaceInAssetUrlFix(url)){
-            WebResourceResponse ret = generateWebResourceResponse(url);
-            if (ret != null) {
-                return ret;
-            }
+        //Check if plugins intercept the request
+        WebResourceResponse ret = super.shouldInterceptRequest(view, url);
+        if(ret == null && (url.contains("?") || url.contains("#") || needsIceCreamSpaceInAssetUrlFix(url))){
+            ret = generateWebResourceResponse(url);
        }
-        return super.shouldInterceptRequest(view, url);
+        return ret;
    }

    private WebResourceResponse generateWebResourceResponse(String url) {
Author	SHA1	Message	Date
Joe Bowser	909e6645e7	Updating JS for Android	2013-04-25 14:55:11 -07:00
Joe Bowser	a308100288	Prep for 2.7.0 final	2013-04-25 13:42:20 -07:00
Joe Bowser	fea8c5d204	Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.7.x	2013-04-25 10:20:07 -07:00
Joe Bowser	a890c8156e	This should be 2.7.0rc1	2013-04-25 10:19:48 -07:00
Shravan Narayan	665c1bd8bb	[CB-3226] Fix: plugins can intercept urls with "?", "#", "%20"(cherry picked from commit `53982272d6`)	2013-04-25 13:11:02 -04:00
Joe Bowser	b22990ca78	cordova-js wasn't properly auto-incremented either	2013-04-19 17:56:26 -07:00
Joe Bowser	832998b67f	2.7.0rc1 prep	2013-04-18 13:05:03 -07:00
 @ -1 +1 @@
 .6.0
 .7.0