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 2014/05/07 01:17:45 UTC
[1/3] android commit: Set VERSION to 3.5.0-rc1 (via coho)
Repository: cordova-android
Updated Branches:
refs/heads/3.5.x [created] a70191a9a
Set VERSION to 3.5.0-rc1 (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/7ec8d08c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7ec8d08c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7ec8d08c
Branch: refs/heads/3.5.x
Commit: 7ec8d08c58d41e0cb1cea52030cf26279880c44d
Parents: 6d40adf
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 6 15:51:13 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue May 6 15:51:13 2014 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7ec8d08c/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 414a102..d711e9a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0-dev
+3.5.0-rc1
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7ec8d08c/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 4250850..645c971 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.5.0-dev";
+var VERSION = "3.5.0-rc1";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7ec8d08c/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 b0e3d43..2575138 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
public class CordovaWebView extends WebView {
public static final String TAG = "CordovaWebView";
- public static final String CORDOVA_VERSION = "3.5.0-dev";
+ public static final String CORDOVA_VERSION = "3.5.0-rc1";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();
[3/3] android commit: OkHttp has broken headers. Updating for ASF
compliance.
Posted by bo...@apache.org.
OkHttp has broken headers. Updating for ASF compliance.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a70191a9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a70191a9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a70191a9
Branch: refs/heads/3.5.x
Commit: a70191a9a4d15f41fdf411c92c71452c151d61bb
Parents: 7ec8d08
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 6 16:16:47 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue May 6 16:16:47 2014 -0700
----------------------------------------------------------------------
.../squareup/okhttp/internal/spdy/ErrorCode.java | 16 ++++++++++++++++
.../com/squareup/okhttp/internal/spdy/Hpack.java | 16 ++++++++++++++++
.../okhttp/internal/spdy/NameValueBlockReader.java | 16 ++++++++++++++++
3 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a70191a9/framework/src/com/squareup/okhttp/internal/spdy/ErrorCode.java
----------------------------------------------------------------------
diff --git a/framework/src/com/squareup/okhttp/internal/spdy/ErrorCode.java b/framework/src/com/squareup/okhttp/internal/spdy/ErrorCode.java
index d3a32e1..04d7bb8 100755
--- a/framework/src/com/squareup/okhttp/internal/spdy/ErrorCode.java
+++ b/framework/src/com/squareup/okhttp/internal/spdy/ErrorCode.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.squareup.okhttp.internal.spdy;
public enum ErrorCode {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a70191a9/framework/src/com/squareup/okhttp/internal/spdy/Hpack.java
----------------------------------------------------------------------
diff --git a/framework/src/com/squareup/okhttp/internal/spdy/Hpack.java b/framework/src/com/squareup/okhttp/internal/spdy/Hpack.java
index c3ca8f1..29f4189 100755
--- a/framework/src/com/squareup/okhttp/internal/spdy/Hpack.java
+++ b/framework/src/com/squareup/okhttp/internal/spdy/Hpack.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.squareup.okhttp.internal.spdy;
import java.io.DataInputStream;
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a70191a9/framework/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
----------------------------------------------------------------------
diff --git a/framework/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java b/framework/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
index b95d013..1b07e8f 100755
--- a/framework/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
+++ b/framework/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.squareup.okhttp.internal.spdy;
import com.squareup.okhttp.internal.Util;
[2/3] android commit: Update JS snapshot to version 3.5.0-rc1 (via
coho)
Posted by bo...@apache.org.
Update JS snapshot to version 3.5.0-rc1 (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/6d40adfe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6d40adfe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6d40adfe
Branch: refs/heads/3.5.x
Commit: 6d40adfe33bac88f51514931b197da9f286b483e
Parents: 93c8ba9
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 6 15:51:13 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue May 6 15:51:13 2014 -0700
----------------------------------------------------------------------
framework/assets/www/cordova.js | 110 ++++++++++++++++++++++++++++++++++-
1 file changed, 108 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6d40adfe/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 45c1943..0e43a23 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.5.0-dev-81f9a00
+// 3.5.0-rc1
/*
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 CORDOVA_JS_BUILD_LABEL = '3.5.0-dev-81f9a00';
+var CORDOVA_JS_BUILD_LABEL = '3.5.0-rc1';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -825,6 +825,7 @@ channel.createSticky('onNativeReady');
channel.createSticky('onCordovaReady');
// Event to indicate that all automatically loaded JS plugins are loaded and ready.
+// FIXME remove this
channel.createSticky('onPluginsReady');
// Event to indicate that Cordova is ready
@@ -1247,6 +1248,111 @@ channel.join(function() {
});
+// file: src/common/init_b.js
+define("cordova/init_b", function(require, exports, module) {
+
+var channel = require('cordova/channel');
+var cordova = require('cordova');
+var platform = require('cordova/platform');
+
+var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady];
+
+// setting exec
+cordova.exec = require('cordova/exec');
+
+function logUnfiredChannels(arr) {
+ for (var i = 0; i < arr.length; ++i) {
+ if (arr[i].state != 2) {
+ console.log('Channel not fired: ' + arr[i].type);
+ }
+ }
+}
+
+window.setTimeout(function() {
+ if (channel.onDeviceReady.state != 2) {
+ console.log('deviceready has not fired after 5 seconds.');
+ logUnfiredChannels(platformInitChannelsArray);
+ logUnfiredChannels(channel.deviceReadyChannelsArray);
+ }
+}, 5000);
+
+// Replace navigator before any modules are required(), to ensure it happens as soon as possible.
+// We replace it so that properties that can't be clobbered can instead be overridden.
+function replaceNavigator(origNavigator) {
+ var CordovaNavigator = function() {};
+ CordovaNavigator.prototype = origNavigator;
+ var newNavigator = new CordovaNavigator();
+ // This work-around really only applies to new APIs that are newer than Function.bind.
+ // Without it, APIs such as getGamepads() break.
+ if (CordovaNavigator.bind) {
+ for (var key in origNavigator) {
+ if (typeof origNavigator[key] == 'function') {
+ newNavigator[key] = origNavigator[key].bind(origNavigator);
+ }
+ }
+ }
+ return newNavigator;
+}
+if (window.navigator) {
+ window.navigator = replaceNavigator(window.navigator);
+}
+
+if (!window.console) {
+ window.console = {
+ log: function(){}
+ };
+}
+if (!window.console.warn) {
+ window.console.warn = function(msg) {
+ this.log("warn: " + msg);
+ };
+}
+
+// Register pause, resume and deviceready channels as events on document.
+channel.onPause = cordova.addDocumentEventHandler('pause');
+channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
+
+// Listen for DOMContentLoaded and notify our channel subscribers.
+if (document.readyState == 'complete' || document.readyState == 'interactive') {
+ channel.onDOMContentLoaded.fire();
+} else {
+ document.addEventListener('DOMContentLoaded', function() {
+ channel.onDOMContentLoaded.fire();
+ }, false);
+}
+
+// _nativeReady is global variable that the native side can set
+// to signify that the native code is ready. It is a global since
+// it may be called before any cordova JS is ready.
+if (window._nativeReady) {
+ channel.onNativeReady.fire();
+}
+
+// Call the platform-specific initialization.
+platform.bootstrap && platform.bootstrap();
+
+/**
+ * Create all cordova objects once native side is ready.
+ */
+channel.join(function() {
+
+ platform.initialize && platform.initialize();
+
+ // Fire event to notify that all objects are created
+ channel.onCordovaReady.fire();
+
+ // Fire onDeviceReady event once page has fully loaded, all
+ // constructors have run and cordova info has been received from native
+ // side.
+ channel.join(function() {
+ require('cordova').fireDocumentEvent('deviceready');
+ }, channel.deviceReadyChannelsArray);
+
+}, platformInitChannelsArray);
+
+});
+
// file: src/common/modulemapper.js
define("cordova/modulemapper", function(require, exports, module) {