Implement the FileList interface. Fixes #6708

This commit is contained in:
Bogdan Cuza 2015-07-23 19:52:39 +03:00 committed by Bogdan
parent effb17b336
commit 8bc66f97f8
9 changed files with 65 additions and 45 deletions

View file

@ -0,0 +1,51 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::Bindings::FileListBinding;
use dom::bindings::codegen::Bindings::FileListBinding::FileListMethods;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Root};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::file::File;
use dom::window::Window;
// https://w3c.github.io/FileAPI/#dfn-filelist
#[dom_struct]
pub struct FileList {
reflector_: Reflector,
list: Vec<JS<File>>
}
impl FileList {
fn new_inherited(files: Vec<JS<File>>) -> FileList {
FileList {
reflector_: Reflector::new(),
list: files
}
}
pub fn new(window: &Window, files: Vec<JS<File>>) -> Root<FileList> {
reflect_dom_object(box FileList::new_inherited(files), GlobalRef::Window(window), FileListBinding::Wrap)
}
}
impl<'a> FileListMethods for &'a FileList {
// https://w3c.github.io/FileAPI/#dfn-length
fn Length(self) -> u32 {
self.list.len() as u32
}
// https://w3c.github.io/FileAPI/#dfn-item
fn Item(self, index: u32) -> Option<Root<File>> {
Some(self.list[index as usize].root())
}
// check-tidy: no specs after this line
fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<File>> {
let item = self.Item(index);
*found = item.is_some();
item
}
}

View file

@ -215,6 +215,7 @@ pub mod event;
pub mod eventdispatcher; pub mod eventdispatcher;
pub mod eventtarget; pub mod eventtarget;
pub mod file; pub mod file;
pub mod filelist;
pub mod filereader; pub mod filereader;
pub mod formdata; pub mod formdata;
pub mod htmlanchorelement; pub mod htmlanchorelement;

View file

@ -0,0 +1,11 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// https://w3c.github.io/FileAPI/#dfn-filelist
interface FileList {
getter File? item(unsigned long index);
readonly attribute unsigned long length;
};

View file

@ -202,6 +202,7 @@ def check_webidl_spec(file_name, contents):
"//xhr.spec.whatwg.org", "//xhr.spec.whatwg.org",
"//www.whatwg.org/html", "//www.whatwg.org/html",
"//www.whatwg.org/specs", "//www.whatwg.org/specs",
"//w3c.github.io",
# Not a URL # Not a URL
"// This interface is entirely internal to Servo, and should not be" + "// This interface is entirely internal to Servo, and should not be" +
" accessible to\n// web pages." " accessible to\n// web pages."

View file

@ -1,11 +1,5 @@
[filelist.html] [filelist.html]
type: testharness type: testharness
[Check if window has a FileList property]
expected: FAIL
[Check if FileList.length is 0]
expected: FAIL
[Check if item is a instanceof Function] [Check if item is a instanceof Function]
expected: FAIL expected: FAIL

View file

@ -48,24 +48,6 @@
[Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)] [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)]
expected: FAIL expected: FAIL
[FileList interface: existence and properties of interface object]
expected: FAIL
[FileList interface object length]
expected: FAIL
[FileList interface: existence and properties of interface prototype object]
expected: FAIL
[FileList interface: existence and properties of interface prototype object's "constructor" property]
expected: FAIL
[FileList interface: operation item(unsigned long)]
expected: FAIL
[FileList interface: attribute length]
expected: FAIL
[FileList must be primary interface of file_input.files] [FileList must be primary interface of file_input.files]
expected: FAIL expected: FAIL

View file

@ -48,24 +48,6 @@
[Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)] [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)]
expected: FAIL expected: FAIL
[FileList interface: existence and properties of interface object]
expected: FAIL
[FileList interface object length]
expected: FAIL
[FileList interface: existence and properties of interface prototype object]
expected: FAIL
[FileList interface: existence and properties of interface prototype object's "constructor" property]
expected: FAIL
[FileList interface: operation item(unsigned long)]
expected: FAIL
[FileList interface: attribute length]
expected: FAIL
[FileReader interface: existence and properties of interface object] [FileReader interface: existence and properties of interface object]
expected: FAIL expected: FAIL

View file

@ -9,9 +9,6 @@
[The MessageChannel interface object should be exposed.] [The MessageChannel interface object should be exposed.]
expected: FAIL expected: FAIL
[The FileList interface object should be exposed.]
expected: FAIL
[The CanvasProxy interface object should be exposed.] [The CanvasProxy interface object should be exposed.]
expected: FAIL expected: FAIL

View file

@ -99,6 +99,7 @@ var interfaceNamesInGlobalScope = [
"Event", "Event",
"EventTarget", "EventTarget",
"File", "File",
"FileList",
"FileReader", "FileReader",
"FormData", "FormData",
"HTMLAnchorElement", "HTMLAnchorElement",