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/23 23:23:39 UTC

[01/13] android commit: CB-6552: added top level package.json

Repository: cordova-android
Updated Branches:
  refs/heads/4.0.x [created] 404d3e095


CB-6552: added top level package.json


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/990ab2c7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/990ab2c7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/990ab2c7

Branch: refs/heads/4.0.x
Commit: 990ab2c7ef01c60614416bfb3a3a0070b3f4b8a3
Parents: 437003d
Author: Steven Gill <st...@gmail.com>
Authored: Wed Apr 30 10:54:47 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:28 2014 -0700

----------------------------------------------------------------------
 package.json | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/990ab2c7/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..d3e153a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "cordova-android",
+  "version": "3.4.0",
+  "description": "This is the release for cordova-android",
+  "main": "bin/create",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+  },
+  "keywords": [
+    "android",
+    "cordova"
+  ],
+  "author": "Joe Bowser",
+  "license": "Apache version 2.0",
+  "dependencies": {
+    "q": "^0.9.0",
+    "shelljs": "^0.2.6"
+  }
+}


[07/13] android commit: Set VERSION to 3.6.0-dev (via coho)

Posted by bo...@apache.org.
Set VERSION to 3.6.0-dev (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/1dcba510
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1dcba510
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1dcba510

Branch: refs/heads/4.0.x
Commit: 1dcba5109209ed6ce22d8a1654fb2a85f73f4e6c
Parents: 7c63b30
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 6 15:51:14 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:30:57 2014 -0700

----------------------------------------------------------------------
 VERSION                                              | 2 +-
 bin/templates/cordova/version                        | 2 +-
 framework/src/org/apache/cordova/CordovaWebView.java | 3 +++
 test/.classpath                                      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1dcba510/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 414a102..86bab9c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0-dev
+3.6.0-dev

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1dcba510/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 4250850..ac3bb54 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.6.0-dev";
 
 console.log(VERSION);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1dcba510/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 e1e4294..d7550a1 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -17,6 +17,9 @@ public interface CordovaWebView {
     Object pluginManager = null;
     Object jsMessageQueue = null;
 
+    public static final String TAG = "CordovaWebView";
+    public static final String CORDOVA_VERSION = "3.6.0-dev";
+
     View getView();
 
     CordovaWebViewClient makeWebViewClient();

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1dcba510/test/.classpath
----------------------------------------------------------------------
diff --git a/test/.classpath b/test/.classpath
index bb0c759..7bc01d9 100644
--- a/test/.classpath
+++ b/test/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>


[09/13] android commit: CB-6707 Update minSdkVersion to 10 consistently

Posted by bo...@apache.org.
CB-6707 Update minSdkVersion to 10 consistently

Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1d0a1664
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1d0a1664
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1d0a1664

Branch: refs/heads/4.0.x
Commit: 1d0a1664e6671f740b86a531fe8513e07eb27207
Parents: 410afbf
Author: Marcel Kinard <cm...@gmail.com>
Authored: Tue May 20 07:00:21 2014 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:30:58 2014 -0700

----------------------------------------------------------------------
 framework/AndroidManifest.xml | 2 +-
 test/AndroidManifest.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d0a1664/framework/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/framework/AndroidManifest.xml b/framework/AndroidManifest.xml
index 15a9702..6fbe1b4 100755
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -19,5 +19,5 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.apache.cordova" android:versionName="1.0" android:versionCode="1">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="10" />
 </manifest>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d0a1664/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 2f99b9a..0224702 100755
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -45,7 +45,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
    
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19"/>
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"


[12/13] android commit: CB-6723 Update package name for Robotium

Posted by bo...@apache.org.
CB-6723 Update package name for Robotium


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f77b20bb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f77b20bb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f77b20bb

Branch: refs/heads/4.0.x
Commit: f77b20bbca774c5422886b094b31971795935b5c
Parents: 1d0a166
Author: Marcel Kinard <cm...@gmail.com>
Authored: Tue May 20 07:09:02 2014 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:31:13 2014 -0700

----------------------------------------------------------------------
 test/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f77b20bb/test/README.md
----------------------------------------------------------------------
diff --git a/test/README.md b/test/README.md
index 1a144e2..38d76a5 100755
--- a/test/README.md
+++ b/test/README.md
@@ -26,8 +26,10 @@ These tests are designed to verify Android native features and other Android spe
 
 There really isn't any manual setup to do. The ant script takes care of that.
 You don't even need to compile cordova-x.y.z.jar or copy it, because 
-project.properties has a library reference to ../framework.  However, Robotium has to be 
-installed for the onScrollChanged tests to work correctly.  It can be found at https://code.google.com/p/robotium/
+project.properties has a library reference to ../framework.  However, Robotium
+has to be installed for the onScrollChanged tests to work correctly.  It can be
+found at https://code.google.com/p/robotium/ and the jar should be put in the
+'libs' directory'.
 
 To run manually from command line:
 


[11/13] android commit: CB-5652 make visible cordova version

Posted by bo...@apache.org.
CB-5652 make visible cordova version

Log the cordova version using version string from CordovaWebView.java

This closes #101


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/410afbf9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/410afbf9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/410afbf9

Branch: refs/heads/4.0.x
Commit: 410afbf9a1eaf99799ae14c3258bac319f45ca5c
Parents: aaddfa6
Author: Martin Gonzalez <ma...@gmail.com>
Authored: Thu May 15 11:55:42 2014 -0500
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:30:58 2014 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaActivity.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/410afbf9/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 2278800..0929947 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -159,6 +159,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Config.init(this);
+        LOG.i(TAG, "Apache Cordova native platform version " + appView.CORDOVA_VERSION + " is starting");
         LOG.d(TAG, "CordovaActivity.onCreate()");
         super.onCreate(savedInstanceState);
 


[05/13] android commit: CB-6552: updated author to apache software foundation in pacakge.json

Posted by bo...@apache.org.
CB-6552: updated author to apache software foundation in pacakge.json


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c012b982
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c012b982
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c012b982

Branch: refs/heads/4.0.x
Commit: c012b98223124ad7147273ebdb076f877077299a
Parents: 559493b
Author: Steven Gill <st...@gmail.com>
Authored: Wed Apr 30 12:55:28 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:29 2014 -0700

----------------------------------------------------------------------
 package.json | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c012b982/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index fd641c8..0d203c9 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,18 @@
 {
   "name": "cordova-android",
   "version": "3.4.0",
-  "description": "This is the release for cordova-android",
+  "description": "cordova-android release",
   "main": "bin/create",
-  "scripts": {
-    "test":"echo \"Error: please view test/readme.md\" && exit 1" 
-  },
   "repository": {
     "type": "git",
     "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
   },
   "keywords": [
     "android",
-    "cordova"
+    "cordova",
+    "apache"
   ],
-  "author": "Joe Bowser",
+  "author": "Apache Software Foundation",
   "license": "Apache version 2.0",
   "dependencies": {
     "q": "^0.9.0",


[02/13] android commit: CB-6491 add CONTRIBUTING.md

Posted by bo...@apache.org.
CB-6491 add CONTRIBUTING.md


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/437003de
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/437003de
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/437003de

Branch: refs/heads/4.0.x
Commit: 437003de29e749f3554db54a2f03782928b7fada
Parents: b6664cc
Author: Marcel Kinard <cm...@gmail.com>
Authored: Wed Apr 30 08:44:21 2014 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:28 2014 -0700

----------------------------------------------------------------------
 CONTRIBUTING.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/437003de/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..1594d12
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+# Contributing to Apache Cordova
+
+Anyone can contribute to Cordova. And we need your contributions.
+
+There are multiple ways to contribute: report bugs, improve the docs, and
+contribute code.
+
+For instructions on this, start with the 
+[contribution overview](http://cordova.apache.org/#contribute).
+
+The details are explained there, but the important items are:
+ - Sign and submit an Apache ICLA (Contributor License Agreement).
+ - Have a Jira issue open that corresponds to your contribution.
+ - Run the tests so your patch doesn't break existing functionality.
+
+We look forward to your contributions!


[10/13] android commit: Update JS snapshot to version 3.6.0-dev (via coho)

Posted by bo...@apache.org.
Update JS snapshot to version 3.6.0-dev (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/aaddfa6f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/aaddfa6f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/aaddfa6f

Branch: refs/heads/4.0.x
Commit: aaddfa6f3a6f1c38335a629e1ccbef170d05b92d
Parents: 2d9a16e
Author: Steven Gill <st...@gmail.com>
Authored: Thu May 8 15:32:28 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:30:58 2014 -0700

----------------------------------------------------------------------
 framework/assets/www/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/aaddfa6f/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index c09cc42..ed621c7 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.6.0-dev-eb7268f
+// 3.6.0-dev-7e845f3
 /*
  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.6.0-dev-eb7268f';
+var CORDOVA_JS_BUILD_LABEL = '3.6.0-dev-7e845f3';
 // file: src/scripts/require.js
 
 /*jshint -W079 */


[13/13] android commit: CB-6315: Wrapping this so it runs on the UI thread

Posted by bo...@apache.org.
CB-6315: Wrapping this so it runs on the UI thread


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/404d3e09
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/404d3e09
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/404d3e09

Branch: refs/heads/4.0.x
Commit: 404d3e0959383fcc3c1ca253944c44fdce36bca9
Parents: f77b20b
Author: Joe Bowser <bo...@apache.org>
Authored: Thu May 22 12:00:11 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:31:13 2014 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/App.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/404d3e09/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index ead99bc..4b15906 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -190,7 +190,11 @@ public class App extends CordovaPlugin {
      * Clear page history for the app.
      */
     public void clearHistory() {
-        this.webView.clearHistory();
+        cordova.getActivity().runOnUiThread(new Runnable() {
+            public void run() {
+                webView.clearHistory();
+            }
+        });
     }
 
     /**


[04/13] android commit: Revert accidentally removed lines from NOTICE

Posted by bo...@apache.org.
Revert accidentally removed lines from NOTICE


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c0eae1ad
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c0eae1ad
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c0eae1ad

Branch: refs/heads/4.0.x
Commit: c0eae1ad52f49345a4938643434ed56beae123fb
Parents: c012b98
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue May 6 15:17:49 2014 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:29 2014 -0700

----------------------------------------------------------------------
 NOTICE | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c0eae1ad/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8ec56a5..40c5e74 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,17 @@
 Apache Cordova
-Copyright 2012 The Apache Software Foundation
+Copyright 2014 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org)
+
+=========================================================================
+==  NOTICE file corresponding to the section 4 d of                    ==
+==  the Apache License, Version 2.0,                                   ==
+==  in this case for the Android-specific code.                        ==
+=========================================================================
+
+This product includes software developed as part of
+The Android Open Source Project (http://source.android.com).
+
+This software includes software developed at Square, Inc.
+Copyright (C) 2013 Square, Inc.


[06/13] android commit: CB-6552: updated test field

Posted by bo...@apache.org.
CB-6552: updated test field


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/559493ba
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/559493ba
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/559493ba

Branch: refs/heads/4.0.x
Commit: 559493babd78749fb27237d355aef19915a2cd98
Parents: 990ab2c
Author: Steven Gill <st...@gmail.com>
Authored: Wed Apr 30 11:59:29 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:29 2014 -0700

----------------------------------------------------------------------
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/559493ba/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index d3e153a..fd641c8 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "This is the release for cordova-android",
   "main": "bin/create",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test":"echo \"Error: please view test/readme.md\" && exit 1" 
   },
   "repository": {
     "type": "git",


[08/13] android commit: Update JS snapshot to version 3.6.0-dev (via coho)

Posted by bo...@apache.org.
Update JS snapshot to version 3.6.0-dev (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/2d9a16e8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2d9a16e8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2d9a16e8

Branch: refs/heads/4.0.x
Commit: 2d9a16e857380457f3dc192dfdc57ed67bdba435
Parents: 1dcba51
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 6 15:51:17 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:30:58 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/2d9a16e8/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 45c1943..c09cc42 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.6.0-dev-eb7268f
 /*
  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.6.0-dev-eb7268f';
 // 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) {
 


[03/13] android commit: Added dash to test push

Posted by bo...@apache.org.
Added dash to test push


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7c63b30d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7c63b30d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7c63b30d

Branch: refs/heads/4.0.x
Commit: 7c63b30de1faacba3a464c978d1070bfd71d1863
Parents: c0eae1a
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Apr 3 10:04:28 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 23 11:23:29 2014 -0700

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7c63b30d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 26ab1e5..8dc2f95 100755
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ Running Tests
 Please see details under test/README.md.
 
 Further Reading
----
+----
 
 - [http://developer.android.com](http://developer.android.com)
 - [http://cordova.apache.org/](http://cordova.apache.org)