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 2013/05/30 20:09:17 UTC
[1/5] android commit: CB-3480: update now uses cordova.js not
cordova-.js
Updated Branches:
refs/heads/2.8.x 89002514f -> fbd6b559d
Updated Tags: refs/tags/2.8.0rc1 [created] fbd6b559d
CB-3480: update now uses cordova.js not cordova-<ver>.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ee58107c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ee58107c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ee58107c
Branch: refs/heads/2.8.x
Commit: ee58107caa1b0d8cda1db180cda1d0ac284d29fd
Parents: 01946dd
Author: David Kemp <dr...@chromium.org>
Authored: Thu May 23 11:55:05 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Thu May 23 12:20:15 2013 -0400
----------------------------------------------------------------------
bin/update | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ee58107c/bin/update
----------------------------------------------------------------------
diff --git a/bin/update b/bin/update
index 92ceda8..9a968b1 100755
--- a/bin/update
+++ b/bin/update
@@ -45,9 +45,9 @@ fi
# cleanup after exit and/or on error
function on_exit {
- if [ -f "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js ]
+ if [ -f "$BUILD_PATH"/framework/assets/www/cordova.js ]
then
- rm "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js
+ rm "$BUILD_PATH"/framework/assets/www/cordova.js
fi
if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
then
@@ -122,10 +122,10 @@ fi
# copy cordova.js, cordova.jar and res/xml
if [ -d "$BUILD_PATH"/framework ]
then
- cp "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+ cp "$BUILD_PATH"/framework/assets/www/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
cp "$BUILD_PATH"/framework/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
else
- cp "$BUILD_PATH"/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+ cp "$BUILD_PATH"/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
cp "$BUILD_PATH"/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
fi
[2/5] android commit: CB-3496: Fixed streaming audio,
this is pretty important for mobile spec
Posted by bo...@apache.org.
CB-3496: Fixed streaming audio, this is pretty important for mobile spec
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1c9d76e6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1c9d76e6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1c9d76e6
Branch: refs/heads/2.8.x
Commit: 1c9d76e637a40ab9301ef307a410ecd33fae15e0
Parents: 01946dd
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 24 11:29:28 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 24 11:29:28 2013 -0700
----------------------------------------------------------------------
framework/src/org/apache/cordova/AudioHandler.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1c9d76e6/framework/src/org/apache/cordova/AudioHandler.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AudioHandler.java b/framework/src/org/apache/cordova/AudioHandler.java
index 20c3c4e..ef20306 100644
--- a/framework/src/org/apache/cordova/AudioHandler.java
+++ b/framework/src/org/apache/cordova/AudioHandler.java
@@ -58,7 +58,10 @@ public class AudioHandler extends CordovaPlugin {
public String getFilePath(String url, String source){
DataResource dataResource = DataResource.initiateNewDataRequestForUri(url, this.webView.pluginManager, cordova, source);
- return dataResource.getRealFile().getPath();
+ if(dataResource.getUri().getScheme().equals("http") || dataResource.getUri().getScheme().equals("https"))
+ return dataResource.getUri().toString();
+ else
+ return dataResource.getRealFile().getPath();
}
/**
[4/5] android commit: Merge branch '2.8.x' of
https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Posted by bo...@apache.org.
Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d36b1cc8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d36b1cc8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d36b1cc8
Branch: refs/heads/2.8.x
Commit: d36b1cc89d434ad3cb4015905762259a837b1d20
Parents: 683e32c 6b5535e
Author: Joe Bowser <bo...@apache.org>
Authored: Sun May 26 16:13:50 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Sun May 26 16:13:50 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
framework/assets/www/cordova.js | 156 +++++++++++++--------
framework/src/org/apache/cordova/Device.java | 2 +-
3 files changed, 97 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[3/5] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-android
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/683e32cf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/683e32cf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/683e32cf
Branch: refs/heads/2.8.x
Commit: 683e32cffbf1f45f8b6e41862d7598a4dcec6250
Parents: 1c9d76e ee58107
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 24 11:29:49 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 24 11:29:49 2013 -0700
----------------------------------------------------------------------
bin/update | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[5/5] android commit: Merge branch '2.8.x' of
https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Posted by bo...@apache.org.
Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fbd6b559
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fbd6b559
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fbd6b559
Branch: refs/heads/2.8.x
Commit: fbd6b559d45bf3e64e1d84ee8c21d04537bc7c89
Parents: d36b1cc 8900251
Author: Joe Bowser <bo...@apache.org>
Authored: Wed May 29 10:46:00 2013 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed May 29 10:46:00 2013 -0400
----------------------------------------------------------------------
README.md | 20 ++
bin/check_reqs.bat | 19 ++-
bin/create | 1 +
bin/templates/cordova/build.bat | 18 ++-
bin/templates/cordova/clean.bat | 16 ++
bin/templates/cordova/cordova.bat | 4 +-
bin/templates/cordova/lib/install-device.bat | 18 ++-
bin/templates/cordova/lib/install-emulator.bat | 18 ++-
bin/templates/cordova/lib/list-devices.bat | 18 ++-
bin/templates/cordova/lib/list-emulator-images.bat | 18 ++-
.../cordova/lib/list-started-emulators.bat | 18 ++-
bin/templates/cordova/lib/start-emulator.bat | 18 ++-
bin/templates/cordova/log.bat | 16 ++
bin/templates/cordova/run.bat | 18 ++-
framework/res/xml/config.xml | 29 ++--
framework/src/org/apache/cordova/AudioHandler.java | 16 +--
.../src/org/apache/cordova/CameraLauncher.java | 61 +++----
framework/src/org/apache/cordova/Capture.java | 13 +-
framework/src/org/apache/cordova/FileHelper.java | 56 +------
framework/src/org/apache/cordova/FileUtils.java | 121 ++++++++-----
.../cordova/IceCreamCordovaWebViewClient.java | 48 +++--
framework/src/org/apache/cordova/JSONUtils.java | 18 ++
.../org/apache/cordova/api/CallbackContext.java | 18 ++
.../src/org/apache/cordova/api/CordovaPlugin.java | 14 --
.../src/org/apache/cordova/api/DataResource.java | 141 ---------------
.../apache/cordova/api/DataResourceContext.java | 31 ----
.../src/org/apache/cordova/api/PluginManager.java | 29 ---
test/README.md | 20 ++
test/res/xml/config.xml | 18 ++
29 files changed, 440 insertions(+), 413 deletions(-)
----------------------------------------------------------------------