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

Merge EventTarget::{get_listeners, get_listeners_for}

Browse source
This commit is contained in:
Anthony Ramine 2016-02-29 10:09:45 +01:00 • committed by Ms2ger
parent b3964a8958
commit 590316a468
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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_, ListenerPhase::Capturing) { if let Some(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);
@ -90,7 +90,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(&type_) { if let Some(listeners) = target.get_listeners_for(&type_, None) {
for listener in listeners { for listener in listeners {
handle_event(window.r(), &listener, target, event); handle_event(window.r(), &listener, target, event);
@ -113,7 +113,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_, ListenerPhase::Bubbling) { if let Some(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);

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

@ -301,16 +301,12 @@ impl EventTarget {
} }
} }
pub fn get_listeners(&self, type_: &Atom) -> Option<Vec<CompiledEventListener>> { pub fn get_listeners_for(&self,
self.handlers.borrow_mut().get_mut(type_).map(|listeners| { type_: &Atom,
listeners.get_listeners(None, self, type_) desired_phase: Option<ListenerPhase>)
})
}
pub fn get_listeners_for(&self, type_: &Atom, desired_phase: ListenerPhase)
-> Option<Vec<CompiledEventListener>> { -> Option<Vec<CompiledEventListener>> {
self.handlers.borrow_mut().get_mut(type_).map(|listeners| { self.handlers.borrow_mut().get_mut(type_).map(|listeners| {
listeners.get_listeners(Some(desired_phase), self, type_) listeners.get_listeners(desired_phase, self, type_)
}) })
} }