diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-23 01:10:46 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-23 01:10:46 -0700 |
commit | 7cea4eb01ce3b84ca276ca417d933fb122005b51 (patch) | |
tree | 3b408b5ee27733159e8ce8b54dfc09838ebbfc17 /components/script/dom/file.rs | |
parent | aa9fc4e0549c54fafef358a50f32f520c9014ba6 (diff) | |
parent | dd590d088b036e06dd5775237e04ac45de3b1488 (diff) | |
download | servo-7cea4eb01ce3b84ca276ca417d933fb122005b51.tar.gz servo-7cea4eb01ce3b84ca276ca417d933fb122005b51.zip |
Auto merge of #11225 - izgzhen:patch-input-element-file, r=Manishearth
Implement file related functionalities in htmlinputelement and related
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy --faster` does not report any errors
- [x] These changes is related to #11131
- [x] These changes do not require tests because it is a partial implementation
1. Improve the `filemanager_thread` by adding type string and create `SelectedFile`
2. Fill several gaps in `htmlinputelement` implementation related to file type
3. Improve the `File` interface to accommodate the above changes
4. Integrate changes introduced by PR #11189
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11225)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/file.rs')
-rw-r--r-- | components/script/dom/file.rs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 9667182671a..4ece71a5ce3 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -10,6 +10,8 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::reflector::reflect_dom_object; use dom::blob::{Blob, DataSlice, blob_parts_to_bytes}; +use dom::window::Window; +use net_traits::filemanager_thread::SelectedFile; use std::sync::Arc; use time; use util::str::DOMString; @@ -45,6 +47,19 @@ impl File { FileBinding::Wrap) } + // Construct from selected file message from file manager thread + pub fn new_from_selected(window: &Window, selected: SelectedFile) -> Root<File> { + let name = DOMString::from(selected.filename.to_str().expect("File name encoding error")); + + // FIXME: fix this after PR #11221 is landed + let id = selected.id; + let slice = DataSlice::empty(); + + let global = GlobalRef::Window(window); + + File::new(global, slice, name, Some(selected.modified as i64), "") + } + // https://w3c.github.io/FileAPI/#file-constructor pub fn Constructor(global: GlobalRef, fileBits: Vec<BlobOrString>, @@ -64,7 +79,6 @@ impl File { pub fn name(&self) -> &DOMString { &self.name } - } impl FileMethods for File { |