Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CBBD210A5D for ; Thu, 5 Dec 2013 00:02:56 +0000 (UTC) Received: (qmail 58791 invoked by uid 500); 5 Dec 2013 00:02:56 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 58776 invoked by uid 500); 5 Dec 2013 00:02:56 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 58769 invoked by uid 99); 5 Dec 2013 00:02:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2013 00:02:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7C2193203C9; Thu, 5 Dec 2013 00:02:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Message-Id: <87f821d2e20945c797d87dfb0e196f64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spec commit: CB-5466: Revert: we're not ready yes for FS urls in file-transfer Date: Thu, 5 Dec 2013 00:02:56 +0000 (UTC) Updated Branches: refs/heads/3.3.x 33aba2fa3 -> 3fa9c1d0b CB-5466: Revert: we're not ready yes for FS urls in file-transfer Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/3fa9c1d0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/3fa9c1d0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/3fa9c1d0 Branch: refs/heads/3.3.x Commit: 3fa9c1d0b4677757dd8a514481cc53c80ffbf394 Parents: 33aba2f Author: Ian Clelland Authored: Wed Dec 4 16:14:45 2013 -0500 Committer: Steven Gill Committed: Wed Dec 4 16:02:46 2013 -0800 ---------------------------------------------------------------------- autotest/tests/filetransfer.tests.js | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/3fa9c1d0/autotest/tests/filetransfer.tests.js ---------------------------------------------------------------------- diff --git a/autotest/tests/filetransfer.tests.js b/autotest/tests/filetransfer.tests.js index c0f0323..304eea1 100644 --- a/autotest/tests/filetransfer.tests.js +++ b/autotest/tests/filetransfer.tests.js @@ -127,7 +127,7 @@ describe('FileTransfer', function() { ft.onprogress = function(e) { lastProgressEvent = e; }; - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail); }); waitsForAny(downloadWin, fail); @@ -151,7 +151,7 @@ describe('FileTransfer', function() { ft.onprogress = function(e) { lastProgressEvent = e; }; - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail); }); waitsForAny(downloadWin, fail); @@ -171,7 +171,7 @@ describe('FileTransfer', function() { }); runs(function() { var ft = new FileTransfer(); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -200,7 +200,7 @@ describe('FileTransfer', function() { ft.onprogress = function(e) { lastProgressEvent = e; }; - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail); waitsForAny(downloadWin, fail); }); @@ -222,7 +222,7 @@ describe('FileTransfer', function() { runs(function() { var ft = new FileTransfer(); console.log("8"); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(fileWin, downloadFail, fileFail); @@ -248,7 +248,7 @@ describe('FileTransfer', function() { ft.abort(); } }; - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -270,7 +270,7 @@ describe('FileTransfer', function() { runs(function() { var ft = new FileTransfer(); ft.abort(); // should be a no-op. - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); ft.abort(); ft.abort(); // should be a no-op. }); @@ -290,7 +290,7 @@ describe('FileTransfer', function() { runs(function() { var ft = new FileTransfer(); ft.abort(); // should be a no-op. - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); ft.abort(); ft.abort(); // should be a no-op. }); @@ -312,7 +312,7 @@ describe('FileTransfer', function() { }); runs(function() { var ft = new FileTransfer(); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -332,7 +332,7 @@ describe('FileTransfer', function() { }); runs(function() { var ft = new FileTransfer(); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -355,7 +355,7 @@ describe('FileTransfer', function() { }); runs(function() { var ft = new FileTransfer(); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -371,7 +371,7 @@ describe('FileTransfer', function() { runs(function() { var ft = new FileTransfer(); - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); @@ -411,7 +411,7 @@ describe('FileTransfer', function() { ft.onprogress = function(e) { lastProgressEvent = e; }; - ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail); + ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail); }); waitsForAny(downloadWin, downloadFail); }); @@ -453,7 +453,7 @@ describe('FileTransfer', function() { }; // removing options cause Android to timeout - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); }; this.after(function() { @@ -504,7 +504,7 @@ describe('FileTransfer', function() { }; // removing options cause Android to timeout - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); }; this.after(function() { @@ -538,7 +538,7 @@ describe('FileTransfer', function() { options.fileName=fileEntry.name; options.mimeType="text/plain"; - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); }; this.after(function() { @@ -574,7 +574,7 @@ describe('FileTransfer', function() { startTime = +new Date(); // removing options cause Android to timeout ft.abort(); // should be a no-op. - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); ft.abort(); ft.abort(); // should be a no-op. }; @@ -607,7 +607,7 @@ describe('FileTransfer', function() { options.fileName=fileEntry.name; options.mimeType="text/plain"; - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); }; this.after(function() { @@ -631,7 +631,7 @@ describe('FileTransfer', function() { }); var fileWin = function(fileEntry) { var ft = new FileTransfer(); - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, {}); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, {}); }; this.after(function() { @@ -655,7 +655,7 @@ describe('FileTransfer', function() { }); var fileWin = function(fileEntry) { var ft = new FileTransfer(); - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, {}); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, {}); }; this.after(function() { @@ -680,7 +680,7 @@ describe('FileTransfer', function() { runs(function() { var ft = new FileTransfer(); - ft.upload(root.toURL() + "/" + localFileName, remoteFile, uploadWin, uploadFail); + ft.upload(root.fullPath + "/" + localFileName, remoteFile, uploadWin, uploadFail); }); waitsForAny(uploadWin, uploadFail); @@ -735,7 +735,7 @@ describe('FileTransfer', function() { }; // removing options cause Android to timeout - ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options); + ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options); }; this.after(function() {