diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index a7bd5408fd5..a8c91558e7d 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -11,7 +11,7 @@ use dom::bindings::utils::{xml_name_type, InvalidXMLName}; use dom::documentfragment::DocumentFragment; use dom::element::{Element}; use dom::element::{HTMLHeadElementTypeId, HTMLTitleElementTypeId}; -use dom::event::{AbstractEvent, Event, HTMLEventTypeId, UIEventTypeId}; +use dom::event::{AbstractEvent, Event}; use dom::htmlcollection::HTMLCollection; use dom::htmldocument::HTMLDocument; use dom::mouseevent::MouseEvent; @@ -223,9 +223,9 @@ impl Document { pub fn CreateEvent(&self, interface: DOMString) -> Fallible { match interface.as_slice() { - "UIEvents" => Ok(UIEvent::new(self.window, UIEventTypeId)), + "UIEvents" => Ok(UIEvent::new(self.window)), "MouseEvents" => Ok(MouseEvent::new(self.window)), - "HTMLEvents" => Ok(Event::new(self.window, HTMLEventTypeId)), + "HTMLEvents" => Ok(Event::new(self.window)), _ => Err(NotSupported) } } diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 01299f3db1f..69b96be8660 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -171,9 +171,9 @@ impl Event { } } - pub fn new(window: @mut Window, type_id: EventTypeId) -> AbstractEvent { - let ev = reflect_dom_object(@mut Event::new_inherited(type_id), window, - EventBinding::Wrap); + pub fn new(window: @mut Window) -> AbstractEvent { + let ev = reflect_dom_object(@mut Event::new_inherited(HTMLEventTypeId), + window, EventBinding::Wrap); Event::as_abstract(ev) } @@ -242,7 +242,7 @@ impl Event { pub fn Constructor(global: @mut Window, type_: DOMString, init: &EventBinding::EventInit) -> Fallible { - let ev = Event::new(global, HTMLEventTypeId); + let ev = Event::new(global); ev.mut_event().InitEvent(type_, init.bubbles, init.cancelable); Ok(ev) } diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 7f6c5a1748e..db087a0e6e4 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -25,8 +25,8 @@ impl UIEvent { } } - pub fn new(window: @mut Window, type_id: EventTypeId) -> AbstractEvent { - let ev = reflect_dom_object(@mut UIEvent::new_inherited(type_id), + pub fn new(window: @mut Window) -> AbstractEvent { + let ev = reflect_dom_object(@mut UIEvent::new_inherited(UIEventTypeId), window, UIEventBinding::Wrap); Event::as_abstract(ev) @@ -35,7 +35,7 @@ impl UIEvent { pub fn Constructor(owner: @mut Window, type_: DOMString, init: &UIEventBinding::UIEventInit) -> Fallible { - let ev = UIEvent::new(owner, UIEventTypeId); + let ev = UIEvent::new(owner); ev.mut_uievent().InitUIEvent(type_, init.parent.bubbles, init.parent.cancelable, init.view, init.detail); Ok(ev) diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 9b49b954b5e..7ad26a18eff 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -12,7 +12,7 @@ use dom::bindings::utils::{Reflectable, GlobalStaticData}; use dom::document::AbstractDocument; use dom::element::Element; use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseUpEvent}; -use dom::event::{Event, HTMLEventTypeId}; +use dom::event::Event; use dom::eventtarget::AbstractEventTarget; use dom::htmldocument::HTMLDocument; use dom::window::Window; @@ -771,7 +771,7 @@ impl ScriptTask { // We have no concept of a document loader right now, so just dispatch the // "load" event as soon as we've finished executing all scripts parsed during // the initial load. - let event = Event::new(window, HTMLEventTypeId); + let event = Event::new(window); event.mut_event().InitEvent(~"load", false, false); let doctarget = AbstractEventTarget::from_document(document); let wintarget = AbstractEventTarget::from_window(window);