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

Return a Vec from EventTarget::get_listeners_for

Browse source
This commit is contained in:
Anthony Ramine 2016-02-29 10:15:55 +01:00 • committed by Ms2ger
parent 590316a468
commit fc2cf31d5a
2 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/eventdispatcher.rs
View file

@ -67,7 +67,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
/* capturing */ /* capturing */
event.set_phase(EventPhase::Capturing); event.set_phase(EventPhase::Capturing);
for cur_target in chain.iter().rev() { for cur_target in chain.iter().rev() {
if let Some(listeners) = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Capturing)) { let listeners = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Capturing));
event.set_current_target(cur_target); event.set_current_target(cur_target);
for listener in &listeners { for listener in &listeners {
handle_event(window.r(), listener, *cur_target, event); handle_event(window.r(), listener, *cur_target, event);
@ -81,7 +81,6 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
return; return;
} }
} }
}
assert!(!event.stop_propagation()); assert!(!event.stop_propagation());
assert!(!event.stop_immediate()); assert!(!event.stop_immediate());
@ -90,8 +89,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
event.set_phase(EventPhase::AtTarget); event.set_phase(EventPhase::AtTarget);
event.set_current_target(target); event.set_current_target(target);
if let Some(listeners) = target.get_listeners_for(&type_, None) { for listener in target.get_listeners_for(&type_, None) {
for listener in listeners {
handle_event(window.r(), &listener, target, event); handle_event(window.r(), &listener, target, event);
if event.stop_immediate() { if event.stop_immediate() {
@ -101,7 +99,6 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
if event.stop_propagation() { if event.stop_propagation() {
return; return;
} }
}
assert!(!event.stop_propagation()); assert!(!event.stop_propagation());
assert!(!event.stop_immediate()); assert!(!event.stop_immediate());
@ -113,7 +110,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
event.set_phase(EventPhase::Bubbling); event.set_phase(EventPhase::Bubbling);
for cur_target in chain { for cur_target in chain {
if let Some(listeners) = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Bubbling)) { let listeners = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Bubbling));
event.set_current_target(cur_target); event.set_current_target(cur_target);
for listener in &listeners { for listener in &listeners {
handle_event(window.r(), listener, *cur_target, event); handle_event(window.r(), listener, *cur_target, event);
@ -127,7 +124,6 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
return; return;
} }
} }
}
} }
// See https://dom.spec.whatwg.org/#concept-event-dispatch for the full dispatch algorithm // See https://dom.spec.whatwg.org/#concept-event-dispatch for the full dispatch algorithm

4
components/script/dom/eventtarget.rs
View file

@ -304,8 +304,8 @@ impl EventTarget {
pub fn get_listeners_for(&self, pub fn get_listeners_for(&self,
type_: &Atom, type_: &Atom,
desired_phase: Option<ListenerPhase>) desired_phase: Option<ListenerPhase>)
-> Option<Vec<CompiledEventListener>> { -> Vec<CompiledEventListener> {
self.handlers.borrow_mut().get_mut(type_).map(|listeners| { self.handlers.borrow_mut().get_mut(type_).map_or(vec![], |listeners| {
listeners.get_listeners(desired_phase, self, type_) listeners.get_listeners(desired_phase, self, type_)
}) })
} }