diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/dom_types.ts | 8 | ||||
| -rw-r--r-- | js/globals.ts | 8 | ||||
| -rw-r--r-- | js/unit_tests.ts | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/js/dom_types.ts b/js/dom_types.ts index bf6e07796..817f91abf 100644 --- a/js/dom_types.ts +++ b/js/dom_types.ts @@ -196,14 +196,16 @@ export interface CustomEvent extends Event { ): void; } -/* TODO(ry) Re-expose this interface. There is currently some interference - * between deno's File and this one. - */ export interface DomFile extends Blob { readonly lastModified: number; readonly name: string; } +export interface DomFileConstructor { + new (bits: BlobPart[], filename: string, options?: FilePropertyBag): DomFile; + prototype: DomFile; +} + export interface FilePropertyBag extends BlobPropertyBag { lastModified?: number; } diff --git a/js/globals.ts b/js/globals.ts index 4bb40fdb5..fae14773b 100644 --- a/js/globals.ts +++ b/js/globals.ts @@ -13,6 +13,7 @@ import * as consoleTypes from "./console"; import * as customEvent from "./custom_event"; import * as deno from "./deno"; import * as domTypes from "./dom_types"; +import * as domFile from "./dom_file"; import * as event from "./event"; import * as eventTarget from "./event_target"; import * as formData from "./form_data"; @@ -74,11 +75,8 @@ window.location = (undefined as unknown) as domTypes.Location; window.Blob = blob.DenoBlob; export type Blob = blob.DenoBlob; -// TODO(ry) Do not export a class implementing the DOM, export the DOM -// interface. See this comment for implementation hint: -// https://github.com/denoland/deno/pull/1396#discussion_r243711502 -// window.File = file.DenoFile; -// export type File = file.DenoFile; +window.File = domFile.DenoFile as domTypes.DomFileConstructor; +export type File = domTypes.DomFile; window.CustomEventInit = customEvent.CustomEventInit; export type CustomEventInit = customEvent.CustomEventInit; diff --git a/js/unit_tests.ts b/js/unit_tests.ts index 6d626d4d4..521616a3c 100644 --- a/js/unit_tests.ts +++ b/js/unit_tests.ts @@ -16,9 +16,7 @@ import "./dir_test.ts"; import "./event_test.ts"; import "./event_target_test.ts"; import "./fetch_test.ts"; -// TODO The global "File" has been temporarily disabled. See the note in -// js/globals.ts -// import "./file_test.ts"; +import "./file_test.ts"; import "./files_test.ts"; import "./form_data_test.ts"; import "./globals_test.ts"; |