mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Return a Vec from EventTarget::get_listeners_for
This commit is contained in:
parent
590316a468
commit
fc2cf31d5a
2 changed files with 26 additions and 30 deletions
|
@ -67,20 +67,19 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
|
|||
/* capturing */
|
||||
event.set_phase(EventPhase::Capturing);
|
||||
for cur_target in chain.iter().rev() {
|
||||
if let Some(listeners) = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Capturing)) {
|
||||
event.set_current_target(cur_target);
|
||||
for listener in &listeners {
|
||||
handle_event(window.r(), listener, *cur_target, event);
|
||||
let listeners = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Capturing));
|
||||
event.set_current_target(cur_target);
|
||||
for listener in &listeners {
|
||||
handle_event(window.r(), listener, *cur_target, event);
|
||||
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if event.stop_propagation() {
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if event.stop_propagation() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
assert!(!event.stop_propagation());
|
||||
|
@ -90,18 +89,16 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
|
|||
event.set_phase(EventPhase::AtTarget);
|
||||
event.set_current_target(target);
|
||||
|
||||
if let Some(listeners) = target.get_listeners_for(&type_, None) {
|
||||
for listener in listeners {
|
||||
handle_event(window.r(), &listener, target, event);
|
||||
for listener in target.get_listeners_for(&type_, None) {
|
||||
handle_event(window.r(), &listener, target, event);
|
||||
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if event.stop_propagation() {
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if event.stop_propagation() {
|
||||
return;
|
||||
}
|
||||
|
||||
assert!(!event.stop_propagation());
|
||||
assert!(!event.stop_immediate());
|
||||
|
@ -113,20 +110,19 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
|
|||
|
||||
event.set_phase(EventPhase::Bubbling);
|
||||
for cur_target in chain {
|
||||
if let Some(listeners) = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Bubbling)) {
|
||||
event.set_current_target(cur_target);
|
||||
for listener in &listeners {
|
||||
handle_event(window.r(), listener, *cur_target, event);
|
||||
let listeners = cur_target.get_listeners_for(&type_, Some(ListenerPhase::Bubbling));
|
||||
event.set_current_target(cur_target);
|
||||
for listener in &listeners {
|
||||
handle_event(window.r(), listener, *cur_target, event);
|
||||
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if event.stop_propagation() {
|
||||
if event.stop_immediate() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if event.stop_propagation() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -304,8 +304,8 @@ impl EventTarget {
|
|||
pub fn get_listeners_for(&self,
|
||||
type_: &Atom,
|
||||
desired_phase: Option<ListenerPhase>)
|
||||
-> Option<Vec<CompiledEventListener>> {
|
||||
self.handlers.borrow_mut().get_mut(type_).map(|listeners| {
|
||||
-> Vec<CompiledEventListener> {
|
||||
self.handlers.borrow_mut().get_mut(type_).map_or(vec![], |listeners| {
|
||||
listeners.get_listeners(desired_phase, self, type_)
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue