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

Use if-let in dispatch_to_listeners, and simplify break conditions.

Browse source
This commit is contained in:
Ms2ger 2015-09-16 13:41:33 +02:00
parent a5925020ce
commit 995cb21b48
1 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,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() {
let stopped = match cur_target.get_listeners_for(&type_, ListenerPhase::Capturing) { if let Some(listeners) = cur_target.get_listeners_for(&type_, ListenerPhase::Capturing) {
Some(listeners) => {
event.set_current_target(cur_target); event.set_current_target(cur_target);
for listener in &listeners { for listener in &listeners {
// Explicitly drop any exception on the floor. // Explicitly drop any exception on the floor.
@ -33,23 +32,18 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
} }
} }
event.stop_propagation() if event.stop_propagation() {
}
None => false
};
if stopped {
break; break;
} }
} }
}
/* at target */ /* at target */
if !event.stop_propagation() { if !event.stop_propagation() {
event.set_phase(EventPhase::AtTarget); event.set_phase(EventPhase::AtTarget);
event.set_current_target(target.clone()); event.set_current_target(target.clone());
let opt_listeners = target.get_listeners(&type_); if let Some(listeners) = target.get_listeners(&type_) {
for listeners in opt_listeners {
for listener in listeners { for listener in listeners {
// Explicitly drop any exception on the floor. // Explicitly drop any exception on the floor.
listener.call_or_handle_event(target, event, Report); listener.call_or_handle_event(target, event, Report);
@ -66,8 +60,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 {
let stopped = match cur_target.get_listeners_for(&type_, ListenerPhase::Bubbling) { if let Some(listeners) = cur_target.get_listeners_for(&type_, ListenerPhase::Bubbling) {
Some(listeners) => {
event.set_current_target(cur_target); event.set_current_target(cur_target);
for listener in &listeners { for listener in &listeners {
// Explicitly drop any exception on the floor. // Explicitly drop any exception on the floor.
@ -78,16 +71,13 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
} }
} }
event.stop_propagation() if event.stop_propagation() {
}
None => false
};
if stopped {
break; break;
} }
} }
} }
} }
}
// 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
pub fn dispatch_event(target: &EventTarget, pseudo_target: Option<&EventTarget>, pub fn dispatch_event(target: &EventTarget, pseudo_target: Option<&EventTarget>,