aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/activation.rs4
-rw-r--r--components/script/dom/document.rs8
-rw-r--r--components/script/dom/mouseevent.rs14
-rw-r--r--components/script/dom/uievent.rs12
-rw-r--r--components/script/dom/webidls/Event.webidl1
5 files changed, 21 insertions, 18 deletions
diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs
index 842b776e48a..46ca27cabb5 100644
--- a/components/script/dom/activation.rs
+++ b/components/script/dom/activation.rs
@@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast};
use dom::bindings::js::{JSRef, Temporary, OptionalRootable};
use dom::element::{Element, ActivationElementHelpers};
-use dom::event::{Event, EventHelpers};
+use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable};
use dom::eventtarget::EventTarget;
use dom::mouseevent::MouseEvent;
use dom::node::window_from_node;
@@ -49,7 +49,7 @@ pub trait Activatable : Copy {
let win = window_from_node(element.r()).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(element.r());
let mouse = MouseEvent::new(win.r(), "click".to_owned(),
- false, false, Some(win.r()), 1,
+ EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, Some(win.r()), 1,
0, 0, 0, 0, ctrlKey, shiftKey, altKey, metaKey,
0, None).root();
let event: JSRef<Event> = EventCast::from_ref(mouse.r());
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index cc9ab9d3849..0db59106fff 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -516,8 +516,8 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
let y = point.y as i32;
let event = MouseEvent::new(window.r(),
"click".to_owned(),
- true,
- true,
+ EventBubbles::Bubbles,
+ EventCancelable::Cancelable,
Some(window.r()),
0i32,
x, y, x, y,
@@ -579,8 +579,8 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
let window = self.window.root();
let mouse_event = MouseEvent::new(window.r(),
"mousemove".to_owned(),
- true,
- true,
+ EventBubbles::Bubbles,
+ EventCancelable::Cancelable,
Some(window.r()),
0i32,
x, y, x, y,
diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs
index 04403a948b6..1af4adf79c4 100644
--- a/components/script/dom/mouseevent.rs
+++ b/components/script/dom/mouseevent.rs
@@ -10,7 +10,7 @@ use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{MutNullableJS, JSRef, RootedReference, Temporary};
use dom::bindings::utils::reflect_dom_object;
-use dom::event::{Event, EventTypeId};
+use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
use dom::eventtarget::EventTarget;
use dom::uievent::UIEvent;
use dom::window::Window;
@@ -64,8 +64,8 @@ impl MouseEvent {
pub fn new(window: JSRef<Window>,
type_: DOMString,
- canBubble: bool,
- cancelable: bool,
+ canBubble: EventBubbles,
+ cancelable: EventCancelable,
view: Option<JSRef<Window>>,
detail: i32,
screenX: i32,
@@ -79,7 +79,7 @@ impl MouseEvent {
button: i16,
relatedTarget: Option<JSRef<EventTarget>>) -> Temporary<MouseEvent> {
let ev = MouseEvent::new_uninitialized(window).root();
- ev.r().InitMouseEvent(type_, canBubble, cancelable, view, detail,
+ ev.r().InitMouseEvent(type_, canBubble == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable, view, detail,
screenX, screenY, clientX, clientY,
ctrlKey, altKey, shiftKey, metaKey,
button, relatedTarget);
@@ -89,9 +89,11 @@ impl MouseEvent {
pub fn Constructor(global: GlobalRef,
type_: DOMString,
init: &MouseEventBinding::MouseEventInit) -> Fallible<Temporary<MouseEvent>> {
+ let bubbles = if init.parent.parent.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
+ let cancelable = if init.parent.parent.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable };
let event = MouseEvent::new(global.as_window(), type_,
- init.parent.parent.parent.bubbles,
- init.parent.parent.parent.cancelable,
+ bubbles,
+ cancelable,
init.parent.parent.view.r(),
init.parent.parent.detail,
init.screenX, init.screenY,
diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs
index c7ab774a2a2..c0f72600344 100644
--- a/components/script/dom/uievent.rs
+++ b/components/script/dom/uievent.rs
@@ -11,7 +11,7 @@ use dom::bindings::global::GlobalRef;
use dom::bindings::js::{MutNullableJS, JSRef, RootedReference, Temporary};
use dom::bindings::utils::reflect_dom_object;
-use dom::event::{Event, EventTypeId};
+use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
use dom::window::Window;
use util::str::DOMString;
@@ -48,20 +48,22 @@ impl UIEvent {
pub fn new(window: JSRef<Window>,
type_: DOMString,
- can_bubble: bool,
- cancelable: bool,
+ can_bubble: EventBubbles,
+ cancelable: EventCancelable,
view: Option<JSRef<Window>>,
detail: i32) -> Temporary<UIEvent> {
let ev = UIEvent::new_uninitialized(window).root();
- ev.r().InitUIEvent(type_, can_bubble, cancelable, view, detail);
+ ev.r().InitUIEvent(type_, can_bubble == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable, view, detail);
Temporary::from_rooted(ev.r())
}
pub fn Constructor(global: GlobalRef,
type_: DOMString,
init: &UIEventBinding::UIEventInit) -> Fallible<Temporary<UIEvent>> {
+ let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
+ let cancelable = if init.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable };
let event = UIEvent::new(global.as_window(), type_,
- init.parent.bubbles, init.parent.cancelable,
+ bubbles, cancelable,
init.view.r(), init.detail);
Ok(event)
}
diff --git a/components/script/dom/webidls/Event.webidl b/components/script/dom/webidls/Event.webidl
index 6e574427548..f71ab52cb5e 100644
--- a/components/script/dom/webidls/Event.webidl
+++ b/components/script/dom/webidls/Event.webidl
@@ -40,4 +40,3 @@ dictionary EventInit {
boolean bubbles = false;
boolean cancelable = false;
};
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 08:10:49 +0000