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,10 +125,17 @@ export class FileSystemAccess {
return; return;
} }
if (isKnown) {
if (onError) {
onError({ message: "Cannot delete known folder." });
}
return;
}
// TODO: Asynchronous // TODO: Asynchronous
this.deleteFolderContent(javaFile); this.deleteFolderContent(javaFile);
if (!isKnown) {
if (javaFile.delete()) { if (javaFile.delete()) {
if (onSuccess) { if (onSuccess) {
onSuccess(); onSuccess();
@ -138,9 +145,7 @@ export class FileSystemAccess {
onError({ message: "Folder deletion failed." }); onError({ message: "Folder deletion failed." });
} }
} }
} else {
// TODO: Notify error?
}
} catch (exception) { } catch (exception) {
if (onError) { if (onError) {
onError(exception); onError(exception);

View File

@ -176,6 +176,14 @@ export class FileSystemAccess {
} }
public deleteFolder(path: string, isKnown?: boolean, onSuccess?: () => any, onError?: (error: any) => any) { 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); this.deleteEntity(path, onSuccess, onError);
} }