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

Invert conditional and return early for AddEventListener/RemoveEventListener

Browse source
This commit is contained in:
Stephen Lester 2016-10-05 07:48:11 -07:00
parent 8a3af9d1b9
commit 76e04e2acd
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -515,7 +515,10 @@ impl EventTargetMethods for EventTarget {
ty: DOMString, ty: DOMString,
listener: Option<Rc<EventListener>>, listener: Option<Rc<EventListener>>,
capture: bool) { capture: bool) {
if let Some(listener) = listener { let listener = match listener {
Some(l) => l,
None => return,
};
let mut handlers = self.handlers.borrow_mut(); let mut handlers = self.handlers.borrow_mut();
let entry = match handlers.entry(Atom::from(ty)) { let entry = match handlers.entry(Atom::from(ty)) {
Occupied(entry) => entry.into_mut(), Occupied(entry) => entry.into_mut(),
@ -531,14 +534,16 @@ impl EventTargetMethods for EventTarget {
entry.push(new_entry); entry.push(new_entry);
} }
} }
}
// https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener // https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener
fn RemoveEventListener(&self, fn RemoveEventListener(&self,
ty: DOMString, ty: DOMString,
listener: Option<Rc<EventListener>>, listener: Option<Rc<EventListener>>,
capture: bool) { capture: bool) {
if let Some(ref listener) = listener { let ref listener = match listener {
Some(l) => l,
None => return,
};
let mut handlers = self.handlers.borrow_mut(); let mut handlers = self.handlers.borrow_mut();
let entry = handlers.get_mut(&Atom::from(ty)); let entry = handlers.get_mut(&Atom::from(ty));
for entry in entry { for entry in entry {
@ -552,7 +557,6 @@ impl EventTargetMethods for EventTarget {
} }
} }
} }
}
// https://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent // https://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent
fn DispatchEvent(&self, event: &Event) -> Fallible<bool> { fn DispatchEvent(&self, event: &Event) -> Fallible<bool> {