Fix: Deleteing known folder should resolve as error

This commit is contained in:
vakrilov
2015-03-20 12:13:12 +02:00
parent 50e6068c07
commit 16b9676a2c
3 changed files with 37 additions and 10 deletions

View File

@ -565,3 +565,17 @@ export var testKnownFolderRename = function () {
});
}
};
export function testKnownFolderRemove(done) {
var result;
var knownFolder = fs.knownFolders.temp();
knownFolder.remove().then(
function () {
done(new Error("Remove known folder should resolve as error."));
},
function (error) {
done(null);
});
};

View File

@ -125,22 +125,27 @@ export class FileSystemAccess {
return;
}
if (isKnown) {
if (onError) {
onError({ message: "Cannot delete known folder." });
}
return;
}
// TODO: Asynchronous
this.deleteFolderContent(javaFile);
if (!isKnown) {
if (javaFile.delete()) {
if (onSuccess) {
onSuccess();
}
} else {
if (onError) {
onError({ message: "Folder deletion failed." });
}
if (javaFile.delete()) {
if (onSuccess) {
onSuccess();
}
} else {
// TODO: Notify error?
if (onError) {
onError({ message: "Folder deletion failed." });
}
}
} catch (exception) {
if (onError) {
onError(exception);

View File

@ -176,6 +176,14 @@ export class FileSystemAccess {
}
public deleteFolder(path: string, isKnown?: boolean, onSuccess?: () => any, onError?: (error: any) => any) {
if (isKnown) {
if (onError) {
onError({ message: "Cannot delete known folder." });
}
return;
}
this.deleteEntity(path, onSuccess, onError);
}