diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-03 20:16:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-03 20:16:39 -0700 |
commit | 110fd6861007544b4f5b15d49da4f297c200bd7c (patch) | |
tree | 89f24ae9547e76e78b7d3f40032186c494d1ad4d /components/script/dom | |
parent | a4b6705c02910d6b4dfcc0b2a9e2c909dfc89ef9 (diff) | |
parent | 411b1b5ffabf822d30978b80bf6f0d916e933aa1 (diff) | |
download | servo-110fd6861007544b4f5b15d49da4f297c200bd7c.tar.gz servo-110fd6861007544b4f5b15d49da4f297c200bd7c.zip |
Auto merge of #12196 - izgzhen:emit-change-file-select, r=Manishearth
Emit change event when files are selected
<!-- Please describe your changes on the following line: -->
r? @Manishearth
As specified in step 6 of [activation behaviour](https://html.spec.whatwg.org/multipage/forms.html#file-upload-state-(type=file)).
---
<!-- 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
<!-- 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. -->
<!-- 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/12196)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/htmlinputelement.rs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 6c3b008bfc8..4b2ff4013b4 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -1150,6 +1150,7 @@ impl Activatable for HTMLInputElement { EventCancelable::NotCancelable); }, InputType::InputFile => { + // https://html.spec.whatwg.org/multipage/#file-upload-state-(type=file) let window = window_from_node(self); let filemanager = window.resource_threads().sender(); @@ -1157,6 +1158,7 @@ impl Activatable for HTMLInputElement { let mut error = None; let filter = filter_from_accept(&self.Accept()); + let target = self.upcast::<EventTarget>(); if self.Multiple() { let (chan, recv) = ipc::channel().expect("Error initializing channel"); @@ -1168,6 +1170,13 @@ impl Activatable for HTMLInputElement { for selected in selected_files { files.push(File::new_from_selected(window.r(), selected)); } + + target.fire_event("input", + EventBubbles::Bubbles, + EventCancelable::NotCancelable); + target.fire_event("change", + EventBubbles::Bubbles, + EventCancelable::NotCancelable); }, Err(err) => error = Some(err), }; @@ -1177,7 +1186,16 @@ impl Activatable for HTMLInputElement { let _ = filemanager.send(msg).unwrap(); match recv.recv().expect("IpcSender side error") { - Ok(selected) => files.push(File::new_from_selected(window.r(), selected)), + Ok(selected) => { + files.push(File::new_from_selected(window.r(), selected)); + + target.fire_event("input", + EventBubbles::Bubbles, + EventCancelable::NotCancelable); + target.fire_event("change", + EventBubbles::Bubbles, + EventCancelable::NotCancelable); + }, Err(err) => error = Some(err), }; } |