You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2012/08/28 00:41:23 UTC
js commit: [CB-1284] - FileTransfer error on playbook
Updated Branches:
refs/heads/master 83504307b -> 106f57ea9
[CB-1284] - FileTransfer error on playbook
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/106f57ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/106f57ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/106f57ea
Branch: refs/heads/master
Commit: 106f57ea9918c15ea8f9146ec2ac7a56eec32bf1
Parents: 8350430
Author: Tim Kim <ti...@nitobi.com>
Authored: Mon Aug 27 15:41:16 2012 -0700
Committer: Tim Kim <ti...@nitobi.com>
Committed: Mon Aug 27 15:41:16 2012 -0700
----------------------------------------------------------------------
lib/webworks/air/plugin/air/FileTransfer.js | 10 ++++------
lib/webworks/air/plugin/manager.js | 3 ++-
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/106f57ea/lib/webworks/air/plugin/air/FileTransfer.js
----------------------------------------------------------------------
diff --git a/lib/webworks/air/plugin/air/FileTransfer.js b/lib/webworks/air/plugin/air/FileTransfer.js
index 7998ec8..1286827 100644
--- a/lib/webworks/air/plugin/air/FileTransfer.js
+++ b/lib/webworks/air/plugin/air/FileTransfer.js
@@ -1,8 +1,6 @@
var cordova = require('cordova'),
-resolveLocalFileSystemURI = require('cordova/plugin/air/resolveLocalFileSystemURI'),
FileTransferError = require('cordova/plugin/FileTransferError'),
-FileUploadResult = require('cordova/plugin/FileUploadResult'),
-FileEntry = require('cordova/plugin/FileEntry');
+FileUploadResult = require('cordova/plugin/FileUploadResult');
var validURLProtocol = new RegExp('^(https?|ftp):\/\/');
@@ -32,7 +30,7 @@ module.exports = {
return { "status" : cordova.callbackStatus.ERROR, "message" : new FileTransferError(FileTransferError.INVALID_URL_ERR) };
}
- resolveLocalFileSystemURI(filePath, fileWin, fail);
+ window.resolveLocalFileSystemURI(filePath, fileWin, fail);
function fileWin(entryObject){
blackberry.io.file.readFile(filePath, readWin, false);
@@ -94,7 +92,7 @@ module.exports = {
fileEntry.createWriter(function(writer) {
writer.onwriteend = function(evt) {
if (!evt.target.error) {
- win(new FileEntry(fileEntry.name, fileEntry.toURL()));
+ win(new window.FileEntry(fileEntry.name, fileEntry.toURL()));
} else {
fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR));
}
@@ -116,7 +114,7 @@ module.exports = {
xhr.onreadystatechange = function () {
if (xhr.readyState == xhr.DONE) {
if (xhr.status == 200 && xhr.response) {
- resolveLocalFileSystemURI(getParentPath(filePath), function(dir) {
+ window.resolveLocalFileSystemURI(getParentPath(filePath), function(dir) {
dir.getFile(getFileName(filePath), {create: true}, writeFile, function(error) {
fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR));
});
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/106f57ea/lib/webworks/air/plugin/manager.js
----------------------------------------------------------------------
diff --git a/lib/webworks/air/plugin/manager.js b/lib/webworks/air/plugin/manager.js
index e6c98f7..fe54298 100644
--- a/lib/webworks/air/plugin/manager.js
+++ b/lib/webworks/air/plugin/manager.js
@@ -8,7 +8,8 @@ var cordova = require('cordova'),
'Capture' : require('cordova/plugin/air/capture'),
'Accelerometer' : require('cordova/plugin/webworks/accelerometer'),
'NetworkStatus' : require('cordova/plugin/air/network'),
- 'Notification' : require('cordova/plugin/webworks/notification')
+ 'Notification' : require('cordova/plugin/webworks/notification'),
+ 'FileTransfer' : require('cordova/plugin/air/FileTransfer')
};
module.exports = {