Merge pull request DefinitelyTyped#3484 from Nemo157/formidable-1.4

Update formidable for TS 1.4
feng-xiao · Jan 19, 2015 · 2d04c57 · 2d04c57
2 parents 56068d3 + c0a8b5c
commit 2d04c57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/formidable/formidable-tests.ts b/formidable/formidable-tests.ts
@@ -37,7 +37,7 @@ form.uploadDir = '/my/dir';
 form.keepExtensions = false;
 form.maxFieldsSize = 2 * 1024 * 1024;
 form.maxFields = 1000;
-// form.hash = false; TODO: Waiting on unions
+form.hash = false;
 form.hash = 'sha1';
 form.multiples = false;
 

diff --git a/formidable/formidable.d.ts b/formidable/formidable.d.ts
@@ -16,7 +16,7 @@ declare module "formidable" {
 		keepExtensions: boolean;
 		maxFieldsSize: number;
 		maxFields: number;
-		hash: string;
+		hash: string | boolean;
 		multiples: boolean;
 		type: string;
 		bytesReceived: number;