mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Make Event::new take enumerated values instead of booleans (fixes #3643)
This commit is contained in:
parent
9dfd5e7fcd
commit
5080c0d86e
4 changed files with 25 additions and 11 deletions
|
@ -35,6 +35,18 @@ pub enum EventTypeId {
|
|||
UIEventTypeId
|
||||
}
|
||||
|
||||
#[deriving(PartialEq)]
|
||||
pub enum EventBubbles {
|
||||
Bubbles,
|
||||
DoesNotBubble
|
||||
}
|
||||
|
||||
#[deriving(PartialEq)]
|
||||
pub enum EventCancelable {
|
||||
Cancelable,
|
||||
NotCancelable
|
||||
}
|
||||
|
||||
#[jstraceable]
|
||||
#[must_root]
|
||||
pub struct Event {
|
||||
|
@ -84,17 +96,19 @@ impl Event {
|
|||
|
||||
pub fn new(global: &GlobalRef,
|
||||
type_: DOMString,
|
||||
can_bubble: bool,
|
||||
cancelable: bool) -> Temporary<Event> {
|
||||
bubbles: EventBubbles,
|
||||
cancelable: EventCancelable) -> Temporary<Event> {
|
||||
let event = Event::new_uninitialized(global).root();
|
||||
event.InitEvent(type_, can_bubble, cancelable);
|
||||
event.InitEvent(type_, bubbles == Bubbles, cancelable == Cancelable);
|
||||
Temporary::from_rooted(*event)
|
||||
}
|
||||
|
||||
pub fn Constructor(global: &GlobalRef,
|
||||
type_: DOMString,
|
||||
init: &EventBinding::EventInit) -> Fallible<Temporary<Event>> {
|
||||
Ok(Event::new(global, type_, init.bubbles, init.cancelable))
|
||||
let bubbles = if init.bubbles { Bubbles } else { DoesNotBubble };
|
||||
let cancelable = if init.cancelable { Cancelable } else { NotCancelable };
|
||||
Ok(Event::new(global, type_, bubbles, cancelable))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ use dom::bindings::utils::{Reflectable, Reflector};
|
|||
use dom::document::{Document, DocumentHelpers};
|
||||
use dom::element::{Element, AttributeHandlers, HTMLFormElementTypeId, HTMLTextAreaElementTypeId, HTMLDataListElementTypeId};
|
||||
use dom::element::{HTMLInputElementTypeId, HTMLButtonElementTypeId, HTMLObjectElementTypeId, HTMLSelectElementTypeId};
|
||||
use dom::event::Event;
|
||||
use dom::event::{Event, Bubbles, Cancelable};
|
||||
use dom::eventtarget::{EventTarget, NodeTargetTypeId};
|
||||
use dom::htmlelement::HTMLElement;
|
||||
use dom::htmlinputelement::HTMLInputElement;
|
||||
|
@ -172,7 +172,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
|
|||
// TODO: Handle validation
|
||||
let event = Event::new(&Window(*win),
|
||||
"submit".to_string(),
|
||||
true, true).root();
|
||||
Bubbles, Cancelable).root();
|
||||
let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
|
||||
target.DispatchEvent(*event).ok();
|
||||
if event.DefaultPrevented() {
|
||||
|
|
|
@ -17,7 +17,7 @@ use dom::bindings::js::{MutNullableJS, JS, JSRef, Temporary, OptionalRootedRoota
|
|||
use dom::bindings::str::ByteString;
|
||||
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
|
||||
use dom::document::Document;
|
||||
use dom::event::Event;
|
||||
use dom::event::{Event, DoesNotBubble, Cancelable};
|
||||
use dom::eventtarget::{EventTarget, EventTargetHelpers, XMLHttpRequestTargetTypeId};
|
||||
use dom::progressevent::ProgressEvent;
|
||||
use dom::urlsearchparams::URLSearchParamsHelpers;
|
||||
|
@ -746,7 +746,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
|
|||
let global = self.global.root();
|
||||
let event = Event::new(&global.root_ref(),
|
||||
"readystatechange".to_string(),
|
||||
false, true).root();
|
||||
DoesNotBubble, Cancelable).root();
|
||||
let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
|
||||
target.dispatch_event_with_target(None, *event).ok();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue