servo: Merge #11757 - Implement filter for file-type input's accept attribute (from izgzhen:file-acccept-mime-filter); r=Manishearth
Now the two sides are pasted together with the new version of `mime_guess` landed.
I tested this thing locally with stuff like this:
```html
<input id="input_file" type="file" accept=".doc,.docx,.xml,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"></input>
<a onclick="open_file();">Click</a>
<script type="text/javascript">
function open_file() {
console.log("Open file");
document.getElementById("input_file").click();
}
</script>
```
Will WPT be able to handle this automatically?
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes is related to #11131
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 33bda9c207001b1f4f0676cbab3222218e94e987
This commit is contained in:
@@ -32,6 +32,7 @@ use dom::nodelist::NodeList;
|
||||
use dom::validation::Validatable;
|
||||
use dom::virtualmethods::VirtualMethods;
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use mime_guess;
|
||||
use net_traits::IpcSend;
|
||||
use net_traits::filemanager_thread::{FileManagerThreadMsg, FilterPattern};
|
||||
use script_traits::ScriptMsg as ConstellationMsg;
|
||||
@@ -44,6 +45,7 @@ use style::element_state::*;
|
||||
use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction};
|
||||
use textinput::Lines::Single;
|
||||
use textinput::{TextInput, SelectionDirection};
|
||||
use util::str::split_commas;
|
||||
|
||||
const DEFAULT_SUBMIT_VALUE: &'static str = "Submit";
|
||||
const DEFAULT_RESET_VALUE: &'static str = "Reset";
|
||||
@@ -1140,7 +1142,7 @@ impl Activatable for HTMLInputElement {
|
||||
let mut files: Vec<Root<File>> = vec![];
|
||||
let mut error = None;
|
||||
|
||||
let filter = filter_from_accept(self.Accept());
|
||||
let filter = filter_from_accept(&self.Accept());
|
||||
|
||||
if self.Multiple() {
|
||||
let (chan, recv) = ipc::channel().expect("Error initializing channel");
|
||||
@@ -1231,9 +1233,20 @@ impl Activatable for HTMLInputElement {
|
||||
}
|
||||
}
|
||||
|
||||
fn filter_from_accept(_s: DOMString) -> Vec<FilterPattern> {
|
||||
/// TODO: it means not pattern restriction now
|
||||
/// Blocked by https://github.com/cybergeek94/mime_guess/issues/19
|
||||
vec![]
|
||||
}
|
||||
// https://html.spec.whatwg.org/multipage/#attr-input-accept
|
||||
fn filter_from_accept(s: &DOMString) -> Vec<FilterPattern> {
|
||||
let mut filter = vec![];
|
||||
for p in split_commas(s) {
|
||||
if let Some('.') = p.chars().nth(0) {
|
||||
filter.push(FilterPattern(p[1..].to_string()));
|
||||
} else {
|
||||
if let Some(exts) = mime_guess::get_mime_extensions_str(p) {
|
||||
for ext in exts {
|
||||
filter.push(FilterPattern(ext.to_string()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
filter
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user