aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/event.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-04 10:52:06 -0800
committerGitHub <noreply@github.com>2017-01-04 10:52:06 -0800
commit6f9ff7b8bf66cbeb7d539c6728db05f05aa8f85c (patch)
tree3b69d3f845bcdda83e27b7174370e8ff54b446d1 /components/script/dom/event.rs
parent96fd0837d3de70b1f0d8f2bff0253b0220e7e5ce (diff)
parent5f0b3bd53c25c158117c91e9da36aaec0342244f (diff)
downloadservo-6f9ff7b8bf66cbeb7d539c6728db05f05aa8f85c.tar.gz
servo-6f9ff7b8bf66cbeb7d539c6728db05f05aa8f85c.zip
Auto merge of #14738 - Wafflespeanut:keypress, r=jdm
Properly dispatch keypress event <!-- Please describe your changes on the following line: --> This was an attempt to fix #14659. It turned out that the problem wasn't what I thought it was. So, I didn't fix that. On the brighter side, this fixes two related issues. - Previously, we were unable to launch `keypress` events from `input` and `textarea` elements, because [we'd been cancelling](https://github.com/servo/servo/blob/1327ebd52f53f5f6637a12fab6cf0cad0aa0be6f/components/script/dom/htmlinputelement.rs#L1120-L1124) the key events, so that they don't trigger window navigation - #8400). I've introduced an enum to represent an additional state to an event's cancellation. - [According to the spec](https://w3c.github.io/uievents/#keypress-event-order), `keypress` (if available) should be dispatched immediately after `keydown`, and it should be followed by `input`. Canceling `keypress` should also cancel `input`. But, we'd been dispatching `input` before `keypress`. We now dispatch `input` once the `keypress` event is on the respective elements. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Either: --> - [x] These changes do not require tests because it's a refactor? <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> r? @jdm or anyone interested <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14738) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/event.rs')
-rw-r--r--components/script/dom/event.rs42
1 files changed, 37 insertions, 5 deletions
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
index d471c25d873..fa3b9bfae6b 100644
--- a/components/script/dom/event.rs
+++ b/components/script/dom/event.rs
@@ -77,6 +77,28 @@ impl From<bool> for EventCancelable {
}
}
+/// An enum to indicate whether the default action of an event is allowed.
+///
+/// This should've been a bool. Instead, it's an enum, because, aside from the allowed/canceled
+/// states, we also need something to stop the event from being handled again (without cancelling
+/// the event entirely). For example, an Up/Down `KeyEvent` inside a `textarea` element will
+/// trigger the cursor to go up/down if the text inside the element spans multiple lines. This enum
+/// helps us to prevent such events from being [sent to the constellation][msg] where it will be
+/// handled once again for page scrolling (which is definitely not what we'd want).
+///
+/// [msg]: https://doc.servo.org/script_traits/enum.ConstellationMsg.html#variant.KeyEvent
+///
+#[derive(JSTraceable, HeapSizeOf, Copy, Clone, PartialEq)]
+pub enum EventDefault {
+ /// The default action of the event is allowed (constructor's default)
+ Allowed,
+ /// The default action has been prevented by calling `PreventDefault`
+ Prevented,
+ /// The event has been handled somewhere in the DOM, and it should be prevented from being
+ /// re-handled elsewhere. This doesn't affect the judgement of `DefaultPrevented`
+ Handled,
+}
+
#[dom_struct]
pub struct Event {
reflector_: Reflector,
@@ -84,7 +106,7 @@ pub struct Event {
target: MutNullableJS<EventTarget>,
type_: DOMRefCell<Atom>,
phase: Cell<EventPhase>,
- canceled: Cell<bool>,
+ canceled: Cell<EventDefault>,
stop_propagation: Cell<bool>,
stop_immediate: Cell<bool>,
cancelable: Cell<bool>,
@@ -103,7 +125,7 @@ impl Event {
target: Default::default(),
type_: DOMRefCell::new(atom!("")),
phase: Cell::new(EventPhase::None),
- canceled: Cell::new(false),
+ canceled: Cell::new(EventDefault::Allowed),
stop_propagation: Cell::new(false),
stop_immediate: Cell::new(false),
cancelable: Cell::new(false),
@@ -146,7 +168,7 @@ impl Event {
self.initialized.set(true);
self.stop_propagation.set(false);
self.stop_immediate.set(false);
- self.canceled.set(false);
+ self.canceled.set(EventDefault::Allowed);
self.trusted.set(false);
self.target.set(None);
*self.type_.borrow_mut() = type_;
@@ -229,6 +251,16 @@ impl Event {
pub fn type_(&self) -> Atom {
self.type_.borrow().clone()
}
+
+ #[inline]
+ pub fn mark_as_handled(&self) {
+ self.canceled.set(EventDefault::Handled);
+ }
+
+ #[inline]
+ pub fn get_cancel_state(&self) -> EventDefault {
+ self.canceled.get()
+ }
}
impl EventMethods for Event {
@@ -254,13 +286,13 @@ impl EventMethods for Event {
// https://dom.spec.whatwg.org/#dom-event-defaultprevented
fn DefaultPrevented(&self) -> bool {
- self.canceled.get()
+ self.canceled.get() == EventDefault::Prevented
}
// https://dom.spec.whatwg.org/#dom-event-preventdefault
fn PreventDefault(&self) {
if self.cancelable.get() {
- self.canceled.set(true)
+ self.canceled.set(EventDefault::Prevented)
}
}