diff --git a/components/script/dom/inputevent.rs b/components/script/dom/inputevent.rs new file mode 100644 index 00000000000..c080ea0c917 --- /dev/null +++ b/components/script/dom/inputevent.rs @@ -0,0 +1,73 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use dom::bindings::codegen::Bindings::InputEventBinding::{self, InputEventMethods}; +use dom::bindings::codegen::Bindings::UIEventBinding::UIEventBinding::UIEventMethods; +use dom::bindings::error::Fallible; +use dom::bindings::js::{Root, RootedReference}; +use dom::bindings::reflector::reflect_dom_object; +use dom::bindings::str::DOMString; +use dom::uievent::UIEvent; +use dom::window::Window; +use dom_struct::dom_struct; + +#[dom_struct] +pub struct InputEvent { + uievent: UIEvent, + data: Option, + is_composing: bool, +} + +impl InputEvent { + pub fn new(window: &Window, + type_: DOMString, + can_bubble: bool, + cancelable: bool, + view: Option<&Window>, + detail: i32, + data: Option, + is_composing: bool) -> Root { + let ev = reflect_dom_object(box InputEvent { + uievent: UIEvent::new_inherited(), + data: data, + is_composing: is_composing, + }, + window, + InputEventBinding::Wrap); + ev.uievent.InitUIEvent(type_, can_bubble, cancelable, view, detail); + ev + } + + pub fn Constructor(window: &Window, + type_: DOMString, + init: &InputEventBinding::InputEventInit) + -> Fallible> { + let event = InputEvent::new(window, + type_, + init.parent.parent.bubbles, + init.parent.parent.cancelable, + init.parent.view.r(), + init.parent.detail, + init.data.clone(), + init.isComposing); + Ok(event) + } +} + +impl InputEventMethods for InputEvent { + // https://w3c.github.io/uievents/#dom-inputevent-data + fn GetData(&self) -> Option { + self.data.clone() + } + + // https://w3c.github.io/uievents/#dom-inputevent-iscomposing + fn IsComposing(&self) -> bool { + self.is_composing + } + + // https://dom.spec.whatwg.org/#dom-event-istrusted + fn IsTrusted(&self) -> bool { + self.uievent.IsTrusted() + } +} diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 6f800625148..1a2a3fc7171 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -372,6 +372,7 @@ pub mod htmlulistelement; pub mod htmlunknownelement; pub mod htmlvideoelement; pub mod imagedata; +pub mod inputevent; pub mod keyboardevent; pub mod location; pub mod mediaerror; diff --git a/components/script/dom/webidls/InputEvent.webidl b/components/script/dom/webidls/InputEvent.webidl new file mode 100644 index 00000000000..30e668b5e43 --- /dev/null +++ b/components/script/dom/webidls/InputEvent.webidl @@ -0,0 +1,21 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* + * The origin of this IDL file is + * https://w3c.github.io/uievents/#idl-inputevent + * + */ + +// https://w3c.github.io/uievents/#idl-inputevent +[Constructor(DOMString type, optional InputEventInit eventInitDict)] +interface InputEvent : UIEvent { + readonly attribute DOMString? data; + readonly attribute boolean isComposing; +}; + +// https://w3c.github.io/uievents/#idl-inputeventinit +dictionary InputEventInit : UIEventInit { + DOMString? data = null; + boolean isComposing = false; +}; diff --git a/tests/wpt/metadata/uievents/constructors/inputevent-constructor.html.ini b/tests/wpt/metadata/uievents/constructors/inputevent-constructor.html.ini deleted file mode 100644 index 6cbae2e0058..00000000000 --- a/tests/wpt/metadata/uievents/constructors/inputevent-constructor.html.ini +++ /dev/null @@ -1,14 +0,0 @@ -[inputevent-constructor.html] - type: testharness - [InputEvent constructor without InputEventInit.] - expected: FAIL - - [InputEvent construtor with InputEventInit where data is null] - expected: FAIL - - [InputEvent construtor with InputEventInit where data is empty string] - expected: FAIL - - [InputEvent construtor with InputEventInit where data is non empty string] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 3db948b5310..e9a237feec4 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -26519,7 +26519,7 @@ "testharness" ], "mozilla/interfaces.html": [ - "49dd9f6ef449813f2ce943d4c9fac351357e5c74", + "ffdc606aaf989ef8bcdecef8cef8764bbb2ae1b2", "testharness" ], "mozilla/interfaces.js": [ diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index ee987ae9322..0400a013bd0 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -140,6 +140,7 @@ test_interfaces([ "HTMLVideoElement", "ImageData", "Image", + "InputEvent", "KeyboardEvent", "Location", "MediaError",