Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fire 'input' event after 'keypress' in input and textarea elements

Browse source
This commit is contained in:
Ravi Shankar 2016-12-27 13:18:45 +05:30
parent 08662cc64e
commit 5f0b3bd53c
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/atoms/static_atoms.txt
View file

@ -52,6 +52,7 @@ beforeunload
message message
click click
keydown keydown
keypress
abort abort
beforescriptexecute beforescriptexecute
afterscriptexecute afterscriptexecute

1
components/script/dom/document.rs
View file

@ -1334,7 +1334,6 @@ impl Document {
let ev = event.upcast::<Event>(); let ev = event.upcast::<Event>();
ev.fire(target); ev.fire(target);
cancel_state = ev.get_cancel_state(); cancel_state = ev.get_cancel_state();
// TODO: if keypress event is canceled, prevent firing input events
} }
if cancel_state == EventDefault::Allowed { if cancel_state == EventDefault::Allowed {

25
components/script/dom/htmlinputelement.rs
View file

@ -1105,17 +1105,6 @@ impl VirtualMethods for HTMLInputElement {
DispatchInput => { DispatchInput => {
self.value_changed.set(true); self.value_changed.set(true);
self.update_placeholder_shown_state(); self.update_placeholder_shown_state();
if event.IsTrusted() {
let window = window_from_node(self);
let _ = window.user_interaction_task_source().queue_event(
&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable,
&window);
}
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage); self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
event.mark_as_handled(); event.mark_as_handled();
} }
@ -1126,7 +1115,19 @@ impl VirtualMethods for HTMLInputElement {
Nothing => (), Nothing => (),
} }
} }
} } else if event.type_() == atom!("keypress") && !event.DefaultPrevented() &&
(self.input_type.get() == InputType::InputText ||
self.input_type.get() == InputType::InputPassword) {
if event.IsTrusted() {
let window = window_from_node(self);
let _ = window.user_interaction_task_source()
.queue_event(&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable,
&window);
}
}
} }
} }

21
components/script/dom/htmltextareaelement.rs
View file

@ -403,17 +403,6 @@ impl VirtualMethods for HTMLTextAreaElement {
KeyReaction::DispatchInput => { KeyReaction::DispatchInput => {
self.value_changed.set(true); self.value_changed.set(true);
self.update_placeholder_shown_state(); self.update_placeholder_shown_state();
if event.IsTrusted() {
let window = window_from_node(self);
let _ = window.user_interaction_task_source().queue_event(
&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable,
&window);
}
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage); self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
event.mark_as_handled(); event.mark_as_handled();
} }
@ -424,6 +413,16 @@ impl VirtualMethods for HTMLTextAreaElement {
KeyReaction::Nothing => (), KeyReaction::Nothing => (),
} }
} }
} else if event.type_() == atom!("keypress") && !event.DefaultPrevented() {
if event.IsTrusted() {
let window = window_from_node(self);
let _ = window.user_interaction_task_source()
.queue_event(&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable,
&window);
}
} }
} }
} }