You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/05/09 01:43:06 UTC
[1/2] android commit: Update JS snapshot to version 4.0.1 (via coho)
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x f224b1f2d -> 6b7eaf238
Update JS snapshot to version 4.0.1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1d7c033e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1d7c033e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1d7c033e
Branch: refs/heads/4.0.x
Commit: 1d7c033e527e5204487bd7e3c8523d25156fcd4e
Parents: f224b1f
Author: Steve Gill <st...@gmail.com>
Authored: Fri May 8 15:33:03 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri May 8 15:33:03 2015 -0700
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7c033e/bin/templates/project/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 148c7aa..c4fbeed 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// b4af1c5ec477dd98cd651932ea6df6d46705d7f9
+// b0463746dd842818c1f08560e998ec847460596c
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '4.0.0';
+var PLATFORM_VERSION_BUILD_LABEL = '4.0.1';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -101,12 +101,15 @@ if (typeof module === "object" && typeof require === "function") {
// file: src/cordova.js
define("cordova", function(require, exports, module) {
-if ("cordova" in window) { throw new Error("cordova already defined"); };
+if(window.cordova){
+ throw new Error("cordova already defined");
+}
var channel = require('cordova/channel');
var platform = require('cordova/platform');
+
/**
* Intercept calls to addEventListener + removeEventListener and handle deviceready,
* resume, and pause events.
@@ -893,11 +896,7 @@ var cordova = require('cordova'),
// For the ONLINE_EVENT to be viable, it would need to intercept all event
// listeners (both through addEventListener and window.ononline) as well
// as set the navigator property itself.
- ONLINE_EVENT: 2,
- // Uses reflection to access private APIs of the WebView that can send JS
- // to be executed.
- // Requires Android 3.2.4 or above.
- PRIVATE_API: 3
+ ONLINE_EVENT: 2
},
jsToNativeBridgeMode, // Set lazily.
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] android commit: Set VERSION to 4.0.1 (via coho)
Posted by st...@apache.org.
Set VERSION to 4.0.1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6b7eaf23
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6b7eaf23
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6b7eaf23
Branch: refs/heads/4.0.x
Commit: 6b7eaf2386d2f73414a91a9883839c365470daf5
Parents: 1d7c033
Author: Steve Gill <st...@gmail.com>
Authored: Fri May 8 15:33:04 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri May 8 15:33:04 2015 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b7eaf23/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index fcdb2e1..1454f6e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.0
+4.0.1
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b7eaf23/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 01c0f12..6717a5f 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "4.0.0";
+var VERSION = "4.0.1";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b7eaf23/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 71eab6d..9a1c576 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
* are not expected to implement it.
*/
public interface CordovaWebView {
- public static final String CORDOVA_VERSION = "4.0.0";
+ public static final String CORDOVA_VERSION = "4.0.1";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b7eaf23/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 233287e..6aa9e8c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "4.0.0",
+ "version": "4.0.1",
"description": "cordova-android release",
"main": "bin/create",
"repository": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org