github/cordova-plugin-file-transfer
github/cordova-plugin-file-transfer
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-file-transfer.git synced 2024-10-06 15:52:20 +08:00
Code Issues Projects Releases Wiki Activity

CB-8095 Fixes JSHint and formatting issues

Browse Source
This commit is contained in:
Vladimir Kotikov 2015-01-08 16:28:45 +03:00 committed by Jesse MacFadyen
parent 320f0d4173
commit 837771c4c6
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/windows/FileTransferProxy.js
View File

@ -20,6 +20,8 @@
*/
/*jshint -W030 */
/*global Windows, WinJS*/
/*global module, require*/
var FTErr = require('./FileTransferError'),
ProgressEvent = require('org.apache.cordova.file.ProgressEvent'),
@ -71,17 +73,17 @@ exec(win, fail, 'FileTransfer', 'upload',
var fileName = options[3];
var mimeType = options[4];
var params = options[5];
var trustAllHosts = options[6]; // todo
var chunkedMode = options[7]; // todo
// var trustAllHosts = options[6]; // todo
// var chunkedMode = options[7]; // todo
var headers = options[8] || {};
var uploadId = options[9];
if (!filePath || (typeof filePath != 'string')) {
if (!filePath || (typeof filePath !== 'string')) {
errorCallback(new FTErr(FTErr.FILE_NOT_FOUND_ERR,null,server));
return;
}
if (filePath.substr(0, 8) == "file:///") {
if (filePath.substr(0, 8) === "file:///") {
filePath = appData.localFolder.path + filePath.substr(8).split("/").join("\\");
} else if (filePath.indexOf('ms-appdata:///') === 0) {
// Handle 'ms-appdata' scheme
@ -143,7 +145,6 @@ exec(win, fail, 'FileTransfer', 'upload',
try {
uploader.createUploadAsync(uri, transferParts).then(
function (upload) {
// update internal TransferOperation object with newly created promise
var uploadOperation = upload.startAsync();
fileTransferOps[uploadId].promise = uploadOperation;
@ -169,7 +170,6 @@ exec(win, fail, 'FileTransfer', 'upload',
});
},
function (error) {
var source = nativePathToCordova(filePath);
// Handle download error here.
@ -208,12 +208,8 @@ exec(win, fail, 'FileTransfer', 'upload',
errorCallback(transferError);
});
});
},
function (evt) {
var progressEvent = new ProgressEvent('progress', {
loaded: evt.progress.bytesSent,
total: evt.progress.totalBytesToSend,
@ -223,7 +219,6 @@ exec(win, fail, 'FileTransfer', 'upload',
successCallback(progressEvent, { keepCallback: true });
}
);
},
function (err) {
var errorObj = new FTErr(FTErr.INVALID_URL_ERR);
@ -250,7 +245,7 @@ exec(win, fail, 'FileTransfer', 'upload',
errorCallback(new FTErr(FTErr.FILE_NOT_FOUND_ERR));
return;
}
if (target.substr(0, 8) == "file:///") {
if (target.substr(0, 8) === "file:///") {
target = appData.localFolder.path + target.substr(8).split("/").join("\\");
} else if (target.indexOf('ms-appdata:///') === 0) {
// Handle 'ms-appdata' scheme
@ -276,7 +271,7 @@ exec(win, fail, 'FileTransfer', 'upload',
// check if download isn't already cancelled
var downloadOp = fileTransferOps[downloadId];
if (downloadOp && downloadOp.state == FileTransferOperation.CANCELLED) {
if (downloadOp && downloadOp.state === FileTransferOperation.CANCELLED) {
// Here we should call errorCB with ABORT_ERR error
errorCallback(new FTErr(FTErr.ABORT_ERR, source, target));
return;
@ -285,7 +280,9 @@ exec(win, fail, 'FileTransfer', 'upload',
// if download isn't cancelled, contunue with creating and preparing download operation
var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader();
for (var header in headers) {
downloader.setRequestHeader(header, headers[header]);
if (header.hasOwnProperty(header)) {
downloader.setRequestHeader(header, headers[header]);
}
}
// create download object. This will throw an exception if URL is malformed

64
tests/tests.js
View File

@ -19,10 +19,15 @@
*
*/
/* global exports, cordova */
/* global describe, it, expect, beforeEach, afterEach, jasmine, pending, spyOn */
/* global FileTransfer, FileTransferError, FileUploadOptions, LocalFileSystem */
exports.defineAutoTests = function () {
// constants
var GRACE_TIME_DELTA = 300 // in milliseconds
var GRACE_TIME_DELTA = 300; // in milliseconds
var UNKNOWN_HOST = "http://foobar.apache.org";
var HEADERS_ECHO = "http://whatheaders.com"; // NOTE: this site is very useful!
@ -34,11 +39,7 @@ exports.defineAutoTests = function () {
// flags
var isWindows = function() {
return (cordova.platformId == "windows") || (navigator.appVersion.indexOf("MSAppHost/1.0") !== -1);
};
var isWP81 = function() {
return navigator.appVersion.indexOf("Windows Phone 8.1;") !== -1;
return (cordova.platformId === "windows") || (navigator.appVersion.indexOf("MSAppHost/1.0") !== -1);
};
describe('FileTransferError', function () {
@ -126,7 +127,7 @@ exports.defineAutoTests = function () {
function (fileEntry) {
fileEntry.createWriter(function (writer) {
writer.onwrite = function (evt) {
writer.onwrite = function () {
console.log('created test file \'' + name + '\'');
success(fileEntry);
};
@ -202,21 +203,27 @@ exports.defineAutoTests = function () {
beforeEach(function() {
// ignore the actual implementations of the unexpected callbacks
for (callback in unexpectedCallbacks) {
spyOn(unexpectedCallbacks, callback);
for (var callback in unexpectedCallbacks) {
if (unexpectedCallbacks.hasOwnProperty(callback)) {
spyOn(unexpectedCallbacks, callback);
}
}
// but run the implementations of the expected callbacks
for (callback in expectedCallbacks) {
spyOn(expectedCallbacks, callback).and.callThrough();
if (expectedCallbacks.hasOwnProperty(callback)) {
spyOn(expectedCallbacks, callback).and.callThrough();
}
}
});
// at the end, check that none of the unexpected callbacks got called,
// and act on the expected callbacks
afterEach(function() {
for (callback in unexpectedCallbacks) {
expect(unexpectedCallbacks[callback]).not.toHaveBeenCalled();
for (var callback in unexpectedCallbacks) {
if (unexpectedCallbacks.hasOwnProperty(callback)) {
expect(unexpectedCallbacks[callback]).not.toHaveBeenCalled();
}
}
if (expectedCallbacks.unsupportedOperation.calls.any()) {
@ -380,7 +387,7 @@ exports.defineAutoTests = function () {
var reader = new FileReader();
reader.onerror = unexpectedCallbacks.fileOperationFail;
reader.onload = function (e) {
reader.onload = function () {
expect(reader.result).toMatch(/The Apache Software Foundation/);
done();
};
@ -607,6 +614,7 @@ exports.defineAutoTests = function () {
var uploadOptions;
var fileName;
var fileContents;
var localFilePath;
// helpers
@ -633,7 +641,7 @@ exports.defineAutoTests = function () {
fileName = 'fileToUpload.txt';
fileContents = 'upload test file';
uploadParams = new Object();
uploadParams = {};
uploadParams.value1 = "test";
uploadParams.value2 = "param";
@ -646,7 +654,7 @@ exports.defineAutoTests = function () {
var fileWin = function (entry) {
localFilePath = entry.toURL();
done();
}
};
// create a file to upload
writeFile(root, fileName, fileContents, fileWin);
@ -665,7 +673,7 @@ exports.defineAutoTests = function () {
verifyUpload(uploadResult);
if (cordova.platformId == 'ios') {
if (cordova.platformId === 'ios') {
expect(uploadResult.headers).toBeDefined('Expected headers to be defined.');
expect(uploadResult.headers['Content-Type']).toBeDefined('Expected content-type header to be defined.');
}
@ -703,7 +711,7 @@ exports.defineAutoTests = function () {
setTimeout(done, GRACE_TIME_DELTA * 2);
};
var fileWin = function (fileEntry) {
var fileWin = function () {
startTime = +new Date();
@ -859,7 +867,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
var videoURL = "http://techslides.com/demos/sample-videos/small.mp4";
function clearResults() {
results = document.getElementById("info");
var results = document.getElementById("info");
results.innerHTML = '';
}
@ -870,8 +878,8 @@ exports.defineManualTests = function (contentEl, createActionButton) {
var ft = new FileTransfer();
console.log("Starting download");
ft.download(source, fileSystem.root.toURL() + filename, function (entry) {
console.log("Download complete")
element.src = urlFn(entry)
console.log("Download complete");
element.src = urlFn(entry);
console.log("Src URL is " + element.src);
console.log("Inserting element");
document.getElementById("info").appendChild(element);
@ -879,14 +887,14 @@ exports.defineManualTests = function (contentEl, createActionButton) {
}
console.log("Requesting filesystem");
clearResults();
requestFileSystem(TEMPORARY, 0, function (fileSystem) {
window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, function (fileSystem) {
console.log("Checking for existing file");
if (directory != undefined) {
if (directory !== undefined) {
console.log("Checking for existing directory.");
fileSystem.root.getDirectory(directory, {}, function (dirEntry) {
dirEntry.removeRecursively(function () {
download(fileSystem);
}, function (e) { console.log("ERROR: dirEntry.removeRecursively") });
}, function () { console.log("ERROR: dirEntry.removeRecursively"); });
}, function () {
download(fileSystem);
});
@ -895,12 +903,12 @@ exports.defineManualTests = function (contentEl, createActionButton) {
console.log("Removing existing file");
entry.remove(function () {
download(fileSystem);
}, function (e) { console.log("ERROR: entry.remove"); });
}, function () { console.log("ERROR: entry.remove"); });
}, function () {
download(fileSystem);
});
}
}, function (e) { console.log("ERROR: requestFileSystem"); });
}, function () { console.log("ERROR: requestFileSystem"); });
}
/******************************************************************************/
@ -923,11 +931,11 @@ exports.defineManualTests = function (contentEl, createActionButton) {
}, 'cdv_image');
createActionButton('Download and display img (native)', function () {
downloadImg(imageURL, function (entry) { return entry.toNativeURL(); }, new Image);
downloadImg(imageURL, function (entry) { return entry.toNativeURL(); }, new Image());
}, 'native_image');
createActionButton('Download to a non-existent dir (should work)', function () {
downloadImg(imageURL, function (entry) { return entry.toURL(); }, new Image, '/nonExistentDirTest/');
downloadImg(imageURL, function (entry) { return entry.toURL(); }, new Image(), '/nonExistentDirTest/');
}, 'non-existent_dir');
createActionButton('Download and play video (cdvfile)', function () {
@ -939,6 +947,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
createActionButton('Download and play video (native)', function () {
var videoElement = document.createElement('video');
videoElement.controls = "controls";
downloadImg(videoURL, function (entry) { return entry.toNativeURL(); }, videoElement)
downloadImg(videoURL, function (entry) { return entry.toNativeURL(); }, videoElement);
}, 'native_video');
};