Invert conditional and return early for AddEventListener/RemoveEventListener

This commit is contained in:
Stephen Lester 2016-10-05 07:48:11 -07:00
parent 8a3af9d1b9
commit 76e04e2acd

View file

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