From 8efaed40a03fcd23d0aaab8bbb84504edcd33f6d Mon Sep 17 00:00:00 2001 From: David Wendt Date: Fri, 18 Dec 2020 23:45:41 -0500 Subject: [PATCH] avm2: `event.eventPhase` is enumerated from 1 --- core/src/avm2/events.rs | 6 +++--- core/src/avm2/object/event_object.rs | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/avm2/events.rs b/core/src/avm2/events.rs index bd565e9a0..ab60f59f6 100644 --- a/core/src/avm2/events.rs +++ b/core/src/avm2/events.rs @@ -25,9 +25,9 @@ pub enum EventPhase { impl Into for EventPhase { fn into(self) -> u32 { match self { - Self::Capturing => 0, - Self::AtTarget => 1, - Self::Bubbling => 2, + Self::Capturing => 1, + Self::AtTarget => 2, + Self::Bubbling => 3, } } } diff --git a/core/src/avm2/object/event_object.rs b/core/src/avm2/object/event_object.rs index f28d727d5..9aa61e30a 100644 --- a/core/src/avm2/object/event_object.rs +++ b/core/src/avm2/object/event_object.rs @@ -108,7 +108,10 @@ impl<'gc> TObject<'gc> for EventObject<'gc> { mc, format!( "[Event type=\"{}\" bubbles={} cancelable={} eventPhase={}]", - event_type, bubbles, cancelable, phase + event_type, + bubbles, + cancelable, + phase - 1 ), ) .into())