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

Return immediately from dispatch_to_listeners if propagation is stopped.

Browse source
This commit is contained in:
Ms2ger 2015-09-16 13:47:31 +02:00
parent af6bc108f3
commit a85196398d
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,18 +28,18 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
listener.call_or_handle_event(*cur_target, event, Report); listener.call_or_handle_event(*cur_target, event, Report);
if event.stop_immediate() { if event.stop_immediate() {
break; return;
} }
} }
if event.stop_propagation() { if event.stop_propagation() {
break; return;
} }
} }
} }
if event.stop_propagation() {
return; assert!(!event.stop_propagation());
} assert!(!event.stop_immediate());
/* at target */ /* at target */
event.set_phase(EventPhase::AtTarget); event.set_phase(EventPhase::AtTarget);
@ -51,13 +51,16 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
listener.call_or_handle_event(target, event, Report); listener.call_or_handle_event(target, event, Report);
if event.stop_immediate() { if event.stop_immediate() {
break; return;
} }
} }
if event.stop_propagation() {
return;
}
} }
if event.stop_propagation() {
return; assert!(!event.stop_propagation());
} assert!(!event.stop_immediate());
/* bubbling */ /* bubbling */
if event.bubbles() { if event.bubbles() {
@ -71,12 +74,12 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
listener.call_or_handle_event(*cur_target, event, Report); listener.call_or_handle_event(*cur_target, event, Report);
if event.stop_immediate() { if event.stop_immediate() {
break; return;
} }
} }
if event.stop_propagation() { if event.stop_propagation() {
break; return;
} }
} }
} }