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

Rename fire_simple_event_params to fire_event

Browse source 
Fixes #9180.
This commit is contained in:
Brandon Fairchild 2016-01-07 13:49:49 -05:00
parent 72ecbbe221
commit fb0304cfdb
5 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -332,15 +332,15 @@ impl EventTarget {
/// Implements https://html.spec.whatwg.org/multipage/#fire-a-simple-event /// Implements https://html.spec.whatwg.org/multipage/#fire-a-simple-event
pub fn fire_simple_event(&self, name: &str, win: GlobalRef) -> Root<Event> { pub fn fire_simple_event(&self, name: &str, win: GlobalRef) -> Root<Event> {
self.fire_simple_event_params(name, EventBubbles::DoesNotBubble, self.fire_event(name, EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable, win) EventCancelable::NotCancelable, win)
} }
/// Implements more customizable variant of EventTarget::fire_simple_event. /// Implements more customizable variant of EventTarget::fire_simple_event.
pub fn fire_simple_event_params(&self, name: &str, pub fn fire_event(&self, name: &str,
bubbles: EventBubbles, bubbles: EventBubbles,
cancelable: EventCancelable, cancelable: EventCancelable,
win: GlobalRef) -> Root<Event> { win: GlobalRef) -> Root<Event> {
let event = Event::new(win, Atom::from(name), bubbles, cancelable); let event = Event::new(win, Atom::from(name), bubbles, cancelable);
event.fire(self); event.fire(self);

24
components/script/dom/htmlformelement.rs
View file

@ -172,10 +172,10 @@ impl HTMLFormElement {
// Step 5 // Step 5
if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod { if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod {
let event = self.upcast::<EventTarget>() let event = self.upcast::<EventTarget>()
.fire_simple_event_params("submit", .fire_event("submit",
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::Cancelable, EventCancelable::Cancelable,
GlobalRef::Window(win.r())); GlobalRef::Window(win.r()));
if event.DefaultPrevented() { if event.DefaultPrevented() {
return; return;
} }
@ -271,10 +271,10 @@ impl HTMLFormElement {
let win = window_from_node(self); let win = window_from_node(self);
let unhandled_invalid_controls = invalid_controls.into_iter().filter_map(|field| { let unhandled_invalid_controls = invalid_controls.into_iter().filter_map(|field| {
let event = field.as_event_target() let event = field.as_event_target()
.fire_simple_event_params("invalid", .fire_event("invalid",
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::Cancelable, EventCancelable::Cancelable,
GlobalRef::Window(win.r())); GlobalRef::Window(win.r()));
if !event.DefaultPrevented() { return Some(field); } if !event.DefaultPrevented() { return Some(field); }
None None
}).collect::<Vec<FormSubmittableElement>>(); }).collect::<Vec<FormSubmittableElement>>();
@ -398,10 +398,10 @@ impl HTMLFormElement {
let win = window_from_node(self); let win = window_from_node(self);
let event = self.upcast::<EventTarget>() let event = self.upcast::<EventTarget>()
.fire_simple_event_params("reset", .fire_event("reset",
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::Cancelable, EventCancelable::Cancelable,
GlobalRef::Window(win.r())); GlobalRef::Window(win.r()));
if event.DefaultPrevented() { if event.DefaultPrevented() {
return; return;
} }

16
components/script/dom/htmlinputelement.rs
View file

@ -866,14 +866,14 @@ impl Activatable for HTMLInputElement {
let win = window_from_node(self); let win = window_from_node(self);
let target = self.upcast::<EventTarget>(); let target = self.upcast::<EventTarget>();
target.fire_simple_event_params("input", target.fire_event("input",
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::NotCancelable, EventCancelable::NotCancelable,
GlobalRef::Window(win.r())); GlobalRef::Window(win.r()));
target.fire_simple_event_params("change", target.fire_event("change",
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::NotCancelable, EventCancelable::NotCancelable,
GlobalRef::Window(win.r())); GlobalRef::Window(win.r()));
} }
}, },
_ => () _ => ()

3
components/script/dom/webidls/Event.webidl
View file

@ -8,6 +8,9 @@
* *
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
* liability, trademark and document use rules apply. * liability, trademark and document use rules apply.
*
* WebIDL specification for this interface:
* https://dom.spec.whatwg.org/#event
*/ */
[Constructor(DOMString type, optional EventInit eventInitDict)] [Constructor(DOMString type, optional EventInit eventInitDict)]

8
components/script/dom/websocket.rs
View file

@ -530,10 +530,10 @@ impl Runnable for CloseTask {
ws.full.set(false); ws.full.set(false);
//A Bad close //A Bad close
ws.clean_close.set(false); ws.clean_close.set(false);
ws.upcast().fire_simple_event_params("error", ws.upcast().fire_event("error",
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::Cancelable, EventCancelable::Cancelable,
global.r()); global.r());
} }
let reason = ws.reason.borrow().clone(); let reason = ws.reason.borrow().clone();
/*In addition, we also have to fire a close even if error event fired /*In addition, we also have to fire a close even if error event fired