aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs2
-rw-r--r--components/script/dom/event.rs4
-rw-r--r--components/script/dom/eventtarget.rs41
-rw-r--r--components/script/dom/htmldetailselement.rs2
-rw-r--r--components/script/dom/htmlformelement.rs15
-rw-r--r--components/script/dom/htmliframeelement.rs2
-rw-r--r--components/script/dom/htmlimageelement.rs8
-rw-r--r--components/script/dom/htmlinputelement.rs16
-rw-r--r--components/script/dom/htmllinkelement.rs4
-rw-r--r--components/script/dom/mediaquerylist.rs2
-rw-r--r--components/script/dom/serviceworker.rs4
-rw-r--r--components/script/dom/serviceworkercontainer.rs2
-rw-r--r--components/script/dom/serviceworkerglobalscope.rs2
-rw-r--r--components/script/dom/websocket.rs4
-rw-r--r--components/script/dom/worker.rs2
15 files changed, 58 insertions, 52 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 2728bc757fb..3878a8f23ee 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -606,7 +606,7 @@ impl Document {
self.ready_state.set(state);
- self.upcast::<EventTarget>().fire_simple_event("readystatechange");
+ self.upcast::<EventTarget>().fire_event("readystatechange");
}
/// Return whether scripting is enabled or not
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
index f50d51dbb65..ca8d5c8c7ac 100644
--- a/components/script/dom/event.rs
+++ b/components/script/dom/event.rs
@@ -330,7 +330,7 @@ impl Runnable for EventRunnable {
fn handler(self: Box<EventRunnable>) {
let target = self.target.root();
- target.fire_event(&*self.name, self.bubbles, self.cancelable);
+ target.fire_event_with_params(&*self.name, self.bubbles, self.cancelable);
}
}
@@ -345,6 +345,6 @@ impl Runnable for SimpleEventRunnable {
fn handler(self: Box<SimpleEventRunnable>) {
let target = self.target.root();
- target.fire_simple_event(&*self.name);
+ target.fire_event(&*self.name);
}
}
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 51452c0fc53..5c65ec195a8 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -490,21 +490,42 @@ impl EventTarget {
!self.handlers.borrow().is_empty()
}
- // https://html.spec.whatwg.org/multipage/#fire-a-simple-event
- pub fn fire_simple_event(&self, name: &str) -> Root<Event> {
- self.fire_event(name, EventBubbles::DoesNotBubble,
- EventCancelable::NotCancelable)
+ // https://dom.spec.whatwg.org/#concept-event-fire
+ pub fn fire_event(&self, name: &str) -> Root<Event> {
+ self.fire_event_with_params(name,
+ EventBubbles::DoesNotBubble,
+ EventCancelable::NotCancelable)
}
// https://dom.spec.whatwg.org/#concept-event-fire
- pub fn fire_event(&self, name: &str,
- bubbles: EventBubbles,
- cancelable: EventCancelable)
- -> Root<Event> {
- let event = Event::new(&self.global(), Atom::from(name), bubbles, cancelable);
+ pub fn fire_bubbling_event(&self, name: &str) -> Root<Event> {
+ self.fire_event_with_params(name,
+ EventBubbles::Bubbles,
+ EventCancelable::NotCancelable)
+ }
- event.fire(self);
+ // https://dom.spec.whatwg.org/#concept-event-fire
+ pub fn fire_cancelable_event(&self, name: &str) -> Root<Event> {
+ self.fire_event_with_params(name,
+ EventBubbles::DoesNotBubble,
+ EventCancelable::Cancelable)
+ }
+ // https://dom.spec.whatwg.org/#concept-event-fire
+ pub fn fire_bubbling_cancelable_event(&self, name: &str) -> Root<Event> {
+ self.fire_event_with_params(name,
+ EventBubbles::Bubbles,
+ EventCancelable::Cancelable)
+ }
+
+ // https://dom.spec.whatwg.org/#concept-event-fire
+ pub fn fire_event_with_params(&self,
+ name: &str,
+ bubbles: EventBubbles,
+ cancelable: EventCancelable)
+ -> Root<Event> {
+ let event = Event::new(&self.global(), Atom::from(name), bubbles, cancelable);
+ event.fire(self);
event
}
}
diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/htmldetailselement.rs
index 93dfef33c7c..b829dc79ee9 100644
--- a/components/script/dom/htmldetailselement.rs
+++ b/components/script/dom/htmldetailselement.rs
@@ -94,7 +94,7 @@ impl Runnable for DetailsNotificationRunnable {
fn handler(self: Box<DetailsNotificationRunnable>) {
let target = self.element.root();
if target.check_toggle_count(self.toggle_number) {
- target.upcast::<EventTarget>().fire_simple_event("toggle");
+ target.upcast::<EventTarget>().fire_event("toggle");
}
}
}
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index fec0ec07946..8db261996b1 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -20,7 +20,6 @@ use dom::bindings::str::DOMString;
use dom::blob::Blob;
use dom::document::Document;
use dom::element::Element;
-use dom::event::{EventBubbles, EventCancelable};
use dom::eventtarget::EventTarget;
use dom::file::File;
use dom::globalscope::GlobalScope;
@@ -305,16 +304,14 @@ impl HTMLFormElement {
{
if self.interactive_validation().is_err() {
// TODO: Implement event handlers on all form control elements
- self.upcast::<EventTarget>().fire_simple_event("invalid");
+ self.upcast::<EventTarget>().fire_event("invalid");
return;
}
}
// Step 5
if submit_method_flag == SubmittedFrom::NotFromForm {
let event = self.upcast::<EventTarget>()
- .fire_event("submit",
- EventBubbles::Bubbles,
- EventCancelable::Cancelable);
+ .fire_bubbling_cancelable_event("submit");
if event.DefaultPrevented() {
return;
}
@@ -484,9 +481,7 @@ impl HTMLFormElement {
// Step 5-6
let unhandled_invalid_controls = invalid_controls.into_iter().filter_map(|field| {
let event = field.as_event_target()
- .fire_event("invalid",
- EventBubbles::DoesNotBubble,
- EventCancelable::Cancelable);
+ .fire_cancelable_event("invalid");
if !event.DefaultPrevented() { return Some(field); }
None
}).collect::<Vec<FormSubmittableElement>>();
@@ -615,9 +610,7 @@ impl HTMLFormElement {
}
let event = self.upcast::<EventTarget>()
- .fire_event("reset",
- EventBubbles::Bubbles,
- EventCancelable::Cancelable);
+ .fire_bubbling_cancelable_event("reset");
if event.DefaultPrevented() {
return;
}
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 73ef7c580d7..069765bb810 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -239,7 +239,7 @@ impl HTMLIFrameElement {
// TODO Step 3 - set child document `mut iframe load` flag
// Step 4
- self.upcast::<EventTarget>().fire_simple_event("load");
+ self.upcast::<EventTarget>().fire_event("load");
let mut blocker = self.load_blocker.borrow_mut();
LoadBlocker::terminate(&mut blocker);
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 373e7ed8480..e5177b28730 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -105,12 +105,12 @@ impl Runnable for ImageResponseHandlerRunnable {
// Fire image.onload
if trigger_image_load {
- element.upcast::<EventTarget>().fire_simple_event("load");
+ element.upcast::<EventTarget>().fire_event("load");
}
// Fire image.onerror
if trigger_image_error {
- element.upcast::<EventTarget>().fire_simple_event("error");
+ element.upcast::<EventTarget>().fire_event("error");
}
// Trigger reflow
@@ -180,8 +180,8 @@ impl HTMLImageElement {
// Step 11, substep 5
let img = self.img.root();
img.current_request.borrow_mut().source_url = Some(self.src.into());
- img.upcast::<EventTarget>().fire_simple_event("error");
- img.upcast::<EventTarget>().fire_simple_event("loadend");
+ img.upcast::<EventTarget>().fire_event("error");
+ img.upcast::<EventTarget>().fire_event("loadend");
}
}
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index f4a9a726d30..ebbff4bc1ec 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -849,12 +849,8 @@ impl HTMLInputElement {
let filelist = FileList::new(&window, files);
self.filelist.set(Some(&filelist));
- target.fire_event("input",
- EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
- target.fire_event("change",
- EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ target.fire_bubbling_event("input");
+ target.fire_bubbling_event("change");
}
}
}
@@ -1290,12 +1286,8 @@ impl Activatable for HTMLInputElement {
// https://html.spec.whatwg.org/multipage/#radio-button-state-(type=radio):activation-behavior
// Check if document owner is fully active
let target = self.upcast::<EventTarget>();
- target.fire_event("input",
- EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
- target.fire_event("change",
- EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ target.fire_bubbling_event("input");
+ target.fire_bubbling_event("change");
},
InputType::InputFile => self.select_files(None),
_ => ()
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index f4cd1ae0718..2312918c751 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -325,7 +325,7 @@ impl FetchResponseListener for StylesheetContext {
if let Some(ref meta) = self.metadata {
if let Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Css, _)))) = meta.content_type {
} else {
- self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
+ self.elem.root().upcast::<EventTarget>().fire_event("error");
}
}
}
@@ -382,7 +382,7 @@ impl FetchResponseListener for StylesheetContext {
let event = if successful { "load" } else { "error" };
- elem.upcast::<EventTarget>().fire_simple_event(event);
+ elem.upcast::<EventTarget>().fire_event(event);
}
}
diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs
index 30e510171b4..aef1c908e8a 100644
--- a/components/script/dom/mediaquerylist.rs
+++ b/components/script/dom/mediaquerylist.rs
@@ -142,7 +142,7 @@ impl WeakMediaQueryListVec {
pub fn evaluate_and_report_changes(&self) {
for mql in self.cell.borrow().iter() {
if let MediaQueryListMatchState::Changed(_) = mql.root().unwrap().evaluate_changes() {
- mql.root().unwrap().upcast::<EventTarget>().fire_simple_event("change");
+ mql.root().unwrap().upcast::<EventTarget>().fire_event("change");
}
}
}
diff --git a/components/script/dom/serviceworker.rs b/components/script/dom/serviceworker.rs
index 8f3686f0b0c..2ff3d218cb3 100644
--- a/components/script/dom/serviceworker.rs
+++ b/components/script/dom/serviceworker.rs
@@ -56,12 +56,12 @@ impl ServiceWorker {
pub fn dispatch_simple_error(address: TrustedServiceWorkerAddress) {
let service_worker = address.root();
- service_worker.upcast().fire_simple_event("error");
+ service_worker.upcast().fire_event("error");
}
pub fn set_transition_state(&self, state: ServiceWorkerState) {
self.state.set(state);
- self.upcast::<EventTarget>().fire_simple_event("statechange");
+ self.upcast::<EventTarget>().fire_event("statechange");
}
pub fn get_script_url(&self) -> Url {
diff --git a/components/script/dom/serviceworkercontainer.rs b/components/script/dom/serviceworkercontainer.rs
index a28440e5c42..6ad13fc317b 100644
--- a/components/script/dom/serviceworkercontainer.rs
+++ b/components/script/dom/serviceworkercontainer.rs
@@ -45,7 +45,7 @@ pub trait Controllable {
impl Controllable for ServiceWorkerContainer {
fn set_controller(&self, active_worker: &ServiceWorker) {
self.controller.set(Some(active_worker));
- self.upcast::<EventTarget>().fire_simple_event("controllerchange");
+ self.upcast::<EventTarget>().fire_event("controllerchange");
}
}
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 021e93399b8..b9c3fb483ad 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -268,7 +268,7 @@ impl ServiceWorkerGlobalScope {
// TODO XXXcreativcoder This will eventually use a FetchEvent interface to fire event
// when we have the Request and Response dom api's implemented
// https://slightlyoff.github.io/ServiceWorker/spec/service_worker_1/index.html#fetch-event-section
- self.upcast::<EventTarget>().fire_simple_event("fetch");
+ self.upcast::<EventTarget>().fire_event("fetch");
let _ = mediator.response_chan.send(None);
}
}
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 5914ff7ea89..c8999b52102 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -498,7 +498,7 @@ impl Runnable for ConnectionEstablishedTask {
}
// Step 6.
- ws.upcast().fire_simple_event("open");
+ ws.upcast().fire_event("open");
}
}
@@ -548,7 +548,7 @@ impl Runnable for CloseTask {
// Step 2.
if self.failed {
- ws.upcast().fire_simple_event("error");
+ ws.upcast().fire_event("error");
}
// Step 3.
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index 87cf1f3e55e..72f058c16f2 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -138,7 +138,7 @@ impl Worker {
pub fn dispatch_simple_error(address: TrustedWorkerAddress) {
let worker = address.root();
- worker.upcast().fire_simple_event("error");
+ worker.upcast().fire_event("error");
}
#[allow(unsafe_code)]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 02:33:12 +0000