From 5915b061c52a700976e61f92f428363bd6060ca5 Mon Sep 17 00:00:00 2001 From: lpy Date: Sun, 9 Mar 2014 00:41:32 +0800 Subject: [PATCH] Implement HTMLFieldSetElement.elements.(fixes #1843) --- .../script/dom/bindings/codegen/Bindings.conf | 2 +- .../script/dom/htmlfieldsetelement.rs | 17 +++---- .../test_htmlfieldsetelement_elements.html | 45 +++++++++++++++++++ 3 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 src/test/content/test_htmlfieldsetelement_elements.html diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 2380a0eaeed8..0aa60ed606b3 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -147,7 +147,7 @@ addHTMLElement('HTMLDirectoryElement') addHTMLElement('HTMLDListElement') addHTMLElement('HTMLElement') addHTMLElement('HTMLEmbedElement') -addHTMLElement('HTMLFieldSetElement') +addHTMLElement('HTMLFieldSetElement', needsAbstract=['elements']) addHTMLElement('HTMLFontElement') addHTMLElement('HTMLFormElement') addHTMLElement('HTMLFrameElement') diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 4dec639d041d..5bbd13c2b798 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -3,16 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLFieldSetElementBinding; -use dom::bindings::codegen::InheritTypes::HTMLFieldSetElementDerived; +use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFieldSetElementDerived, NodeCast}; use dom::bindings::js::JS; use dom::bindings::error::ErrorResult; use dom::document::Document; -use dom::element::HTMLFieldSetElementTypeId; +use dom::element::{Element, HTMLFieldSetElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::htmlformelement::HTMLFormElement; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; -use dom::node::{Node, ElementNodeTypeId}; +use dom::node::{Node, ElementNodeTypeId, window_from_node}; use dom::validitystate::ValidityState; use servo_util::str::DOMString; @@ -68,11 +68,12 @@ impl HTMLFieldSetElement { ~"" } - pub fn Elements(&self) -> JS { - // FIXME: https://github.com/mozilla/servo/issues/1843 - let doc = self.htmlelement.element.node.owner_doc(); - let doc = doc.get(); - HTMLCollection::new(&doc.window, ~[]) + pub fn Elements(&self, abstract_self: &JS) -> JS { + let node: JS = NodeCast::from(abstract_self); + let element: JS = ElementCast::from(abstract_self); + let window = &window_from_node(&node); + let listed_elements = ["button", "fieldset", "input", "keygen", "object", "output", "select", "textarea"]; + HTMLCollection::create(window, &node, |elem| *elem != element && listed_elements.iter().any(|&tag_name| tag_name == elem.get().tag_name)) } pub fn WillValidate(&self) -> bool { diff --git a/src/test/content/test_htmlfieldsetelement_elements.html b/src/test/content/test_htmlfieldsetelement_elements.html new file mode 100644 index 000000000000..3f599a44b9d0 --- /dev/null +++ b/src/test/content/test_htmlfieldsetelement_elements.html @@ -0,0 +1,45 @@ + + +
+ Display + +
+ +
+ + + +
+ + + = + +
+
+ + +

You do not have Java available, or it is disabled.

+ +
My Java Clock
+
+
+ +