You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/09/25 16:47:52 UTC
[1/3] git commit: CB-4889 renaming
org.apache.cordova.core.file-transfer to org.apache.cordova.file-transfer and
updating dependency
Updated Branches:
refs/heads/dev ae3caf491 -> ba3f9dddb
CB-4889 renaming org.apache.cordova.core.file-transfer to org.apache.cordova.file-transfer and updating dependency
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/00ec1105
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/00ec1105
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/00ec1105
Branch: refs/heads/dev
Commit: 00ec110525e96acaf8514f8548fbd345d7ce724f
Parents: 61bb960
Author: Anis Kadri <an...@apache.org>
Authored: Sat Sep 21 12:25:10 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Sat Sep 21 12:25:10 2013 +0200
----------------------------------------------------------------------
plugin.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/00ec1105/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index dd08a19..18f2c78 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.core.file-transfer"
- version="0.3.1-dev">
+ id="org.apache.cordova.file-transfer"
+ version="0.3.1">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova,file,transfer</keywords>
- <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file" commit="master" />
+ <dependency id="org.apache.cordova.file" />
<js-module src="www/FileTransferError.js" name="FileTransferError">
<clobbers target="window.FileTransferError" />
[2/3] git commit: CB-4889 updating core references
Posted by an...@apache.org.
CB-4889 updating core references
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/93d8bfc2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/93d8bfc2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/93d8bfc2
Branch: refs/heads/dev
Commit: 93d8bfc2c50eed169bac1f171b29c24c30cda300
Parents: 00ec110
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 16:46:54 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 16:46:54 2013 +0200
----------------------------------------------------------------------
www/FileTransfer.js | 6 +++---
www/windows8/FileTransferProxy.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/93d8bfc2/www/FileTransfer.js
----------------------------------------------------------------------
diff --git a/www/FileTransfer.js b/www/FileTransfer.js
index 6eb9d74..e8e89be 100644
--- a/www/FileTransfer.js
+++ b/www/FileTransfer.js
@@ -22,7 +22,7 @@
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
FileTransferError = require('./FileTransferError'),
- ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent');
+ ProgressEvent = require('org.apache.cordova.file.ProgressEvent');
function newProgressEvent(result) {
var pe = new ProgressEvent();
@@ -175,10 +175,10 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
} else if (successCallback) {
var entry = null;
if (result.isDirectory) {
- entry = new (require('org.apache.cordova.core.file.DirectoryEntry'))();
+ entry = new (require('org.apache.cordova.file.DirectoryEntry'))();
}
else if (result.isFile) {
- entry = new (require('org.apache.cordova.core.file.FileEntry'))();
+ entry = new (require('org.apache.cordova.file.FileEntry'))();
}
entry.isDirectory = result.isDirectory;
entry.isFile = result.isFile;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/93d8bfc2/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js
index dd8ff62..e312625 100644
--- a/www/windows8/FileTransferProxy.js
+++ b/www/windows8/FileTransferProxy.js
@@ -21,8 +21,8 @@
var FileTransferError = require('./FileTransferError'),
- FileUploadResult = require('org.apache.cordova.core.file.FileUploadResult'),
- FileEntry = require('org.apache.cordova.core.file.FileEntry');
+ FileUploadResult = require('org.apache.cordova.file.FileUploadResult'),
+ FileEntry = require('org.apache.cordova.file.FileEntry');
module.exports = {
@@ -107,4 +107,4 @@ module.exports = {
}
};
-require("cordova/commandProxy").add("FileTransfer",module.exports);
\ No newline at end of file
+require("cordova/commandProxy").add("FileTransfer",module.exports);
[3/3] git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer into dev
Posted by an...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer into dev
Conflicts:
www/windows8/FileTransferProxy.js
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/ba3f9ddd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/ba3f9ddd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/ba3f9ddd
Branch: refs/heads/dev
Commit: ba3f9dddbf2c7679297247c3e23610eb78199f76
Parents: 93d8bfc ae3caf4
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 16:47:36 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 16:47:36 2013 +0200
----------------------------------------------------------------------
www/windows8/FileTransferProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/ba3f9ddd/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------