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 2013/10/28 23:12:16 UTC
[1/6] git commit: Merge branch 'fix-win8' of
https://github.com/Touchit/cordova-plugin-file-transfer into dev
Updated Branches:
refs/heads/dev d7db66c81 -> 60f96e078
Merge branch 'fix-win8' of https://github.com/Touchit/cordova-plugin-file-transfer into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/32e980db
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/32e980db
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/32e980db
Branch: refs/heads/dev
Commit: 32e980dbde11f0f20d9dfe01b13e70be29386f14
Parents: 2be905f
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Sep 30 14:03:05 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Thu Oct 3 10:46:27 2013 -0700
----------------------------------------------------------------------
www/FileTransfer.js | 2 +-
www/windows8/FileTransferProxy.js | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/32e980db/www/FileTransfer.js
----------------------------------------------------------------------
diff --git a/www/FileTransfer.js b/www/FileTransfer.js
index e8e89be..66a1c4b 100644
--- a/www/FileTransfer.js
+++ b/www/FileTransfer.js
@@ -42,7 +42,7 @@ function getBasicAuthHeader(urlString) {
var credentials = null;
var protocol = url.protocol + "//";
- var origin = protocol + url.host;
+ var origin = protocol + url.host.replace(":" + url.port, ""); // Windows 8 (IE10) append :80 or :443 to url.host
// check whether there are the username:password credentials in the url
if (url.href.indexOf(origin) !== 0) { // credentials found
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/32e980db/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js
index e3a28d6..4ca88fc 100644
--- a/www/windows8/FileTransferProxy.js
+++ b/www/windows8/FileTransferProxy.js
@@ -29,6 +29,7 @@ module.exports = {
upload:function(successCallback, error, options) {
var filePath = options[0];
var server = options[1];
+ var headers = options[8] || {};
var win = function (fileUploadResult) {
@@ -49,7 +50,7 @@ module.exports = {
var blob = MSApp.createBlobFromRandomAccessStream(storageFile.contentType, stream);
var formData = new FormData();
formData.append("source\";filename=\"" + storageFile.name + "\"", blob);
- WinJS.xhr({ type: "POST", url: server, data: formData }).then(function (response) {
+ WinJS.xhr({ type: "POST", url: server, data: formData, headers: headers }).then(function (response) {
var code = response.status;
storageFile.getBasicPropertiesAsync().done(function (basicProperties) {
@@ -73,6 +74,7 @@ module.exports = {
download:function(win, error, options) {
var source = options[0];
var target = options[1];
+ var headers = options[4] || {};
if (target === null || typeof target === undefined) {
@@ -96,6 +98,13 @@ module.exports = {
storageFolder.createFileAsync(fileName, Windows.Storage.CreationCollisionOption.generateUniqueName).then(function (storageFile) {
var uri = Windows.Foundation.Uri(source);
var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader();
+
+ if (headers) {
+ for (var header in headers) {
+ downloader.setRequestHeader(header, headers[header]);
+ }
+ }
+
download = downloader.createDownload(uri, storageFile);
download.startAsync().then(function () {
win(new FileEntry(storageFile.name, storageFile.path));
[6/6] git commit: CB-5188:
Posted by st...@apache.org.
CB-5188:
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/60f96e07
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/60f96e07
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/60f96e07
Branch: refs/heads/dev
Commit: 60f96e078b5d2cd8cf1c22556fb76d62f473fbca
Parents: ac7cb43
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:27:15 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:27:15 2013 -0700
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/60f96e07/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 114b072..d1de8dd 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.file-transfer"
- version="0.3.4">
+ version="0.3.5-dev">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
[5/6] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/ac7cb43d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/ac7cb43d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/ac7cb43d
Branch: refs/heads/dev
Commit: ac7cb43da3428faa0de97184c3f7a7d7cd14e160
Parents: 2d2e444 2e5e6ea
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:11:14 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:11:14 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 4 ++++
plugin.xml | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/6] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/2d2e4445
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/2d2e4445
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/2d2e4445
Branch: refs/heads/dev
Commit: 2d2e4445bb887980412170404a6e3e2de9be57d6
Parents: 9337aa1 9d2246e
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 9 15:47:27 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 9 15:47:27 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 7 +++++++
plugin.xml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/6] git commit: [CB-5188] Updated version and RELEASENOTES.md for
release 0.3.4
Posted by st...@apache.org.
[CB-5188] Updated version and RELEASENOTES.md for release 0.3.4
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/2e5e6eaf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/2e5e6eaf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/2e5e6eaf
Branch: refs/heads/dev
Commit: 2e5e6eafafbeb66bc67912e9d53a42a8bea788da
Parents: d7db66c
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 11:49:05 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 11:49:05 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 4 ++++
plugin.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/2e5e6eaf/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f51b327..5985831 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -33,3 +33,7 @@
* Fix missing headers in Windows 8 Proxy
* Fix Windows 8 HTMLAnchorElement return host:80 which force Basic Auth Header to replace options Auth Header
* [CB-4915] Incremented plugin version on dev branch.
+
+ ### 0.3.4 (Oct 28, 2013)
+* CB-5128: added repo + issue tag to plugin.xml for file transfer plugin
+* [CB-5010] Incremented plugin version on dev branch.
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/2e5e6eaf/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 0451295..114b072 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.file-transfer"
- version="0.3.4-dev">
+ version="0.3.4">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
[2/6] git commit: removed un-needed undef check
Posted by st...@apache.org.
removed un-needed undef check
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/9337aa1a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/9337aa1a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/9337aa1a
Branch: refs/heads/dev
Commit: 9337aa1a89eb6fd0382590b7976cac5431557796
Parents: 32e980d
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Sep 30 14:19:42 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Thu Oct 3 10:47:04 2013 -0700
----------------------------------------------------------------------
www/windows8/FileTransferProxy.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/9337aa1a/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js
index 4ca88fc..6f5c0f9 100644
--- a/www/windows8/FileTransferProxy.js
+++ b/www/windows8/FileTransferProxy.js
@@ -99,12 +99,11 @@ module.exports = {
var uri = Windows.Foundation.Uri(source);
var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader();
- if (headers) {
- for (var header in headers) {
- downloader.setRequestHeader(header, headers[header]);
- }
+ for (var header in headers) {
+ downloader.setRequestHeader(header, headers[header]);
}
+
download = downloader.createDownload(uri, storageFile);
download.startAsync().then(function () {
win(new FileEntry(storageFile.name, storageFile.path));