Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1865 : lpy/servo/issue1843, r=jdm

Browse source 
see #1843
This commit is contained in:
bors-servo 2014-03-19 17:02:05 -04:00
commit b345e9458a
3 changed files with 55 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/bindings/codegen/Bindings.conf
View file

@ -147,7 +147,7 @@ addHTMLElement('HTMLDirectoryElement')
addHTMLElement('HTMLDListElement') addHTMLElement('HTMLDListElement')
addHTMLElement('HTMLElement') addHTMLElement('HTMLElement')
addHTMLElement('HTMLEmbedElement') addHTMLElement('HTMLEmbedElement')
addHTMLElement('HTMLFieldSetElement') addHTMLElement('HTMLFieldSetElement', needsAbstract=['elements'])
addHTMLElement('HTMLFontElement') addHTMLElement('HTMLFontElement')
addHTMLElement('HTMLFormElement') addHTMLElement('HTMLFormElement')
addHTMLElement('HTMLFrameElement') addHTMLElement('HTMLFrameElement')

17
src/components/script/dom/htmlfieldsetelement.rs
View file

@ -3,16 +3,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::HTMLFieldSetElementBinding; 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::js::JS;
use dom::bindings::error::ErrorResult; use dom::bindings::error::ErrorResult;
use dom::document::Document; use dom::document::Document;
use dom::element::HTMLFieldSetElementTypeId; use dom::element::{Element, HTMLFieldSetElementTypeId};
use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlformelement::HTMLFormElement; use dom::htmlformelement::HTMLFormElement;
use dom::htmlcollection::HTMLCollection; use dom::htmlcollection::HTMLCollection;
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::node::{Node, ElementNodeTypeId}; use dom::node::{Node, ElementNodeTypeId, window_from_node};
use dom::validitystate::ValidityState; use dom::validitystate::ValidityState;
use servo_util::str::DOMString; use servo_util::str::DOMString;
@ -68,11 +68,12 @@ impl HTMLFieldSetElement {
~"" ~""
} }
pub fn Elements(&self) -> JS<HTMLCollection> { pub fn Elements(&self, abstract_self: &JS<HTMLFieldSetElement>) -> JS<HTMLCollection> {
// FIXME: https://github.com/mozilla/servo/issues/1843 let node: JS<Node> = NodeCast::from(abstract_self);
let doc = self.htmlelement.element.node.owner_doc(); let element: JS<Element> = ElementCast::from(abstract_self);
let doc = doc.get(); let window = &window_from_node(&node);
HTMLCollection::new(&doc.window, ~[]) 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 { pub fn WillValidate(&self) -> bool {

45
src/test/content/test_htmlfieldsetelement_elements.html Normal file
View file

@ -0,0 +1,45 @@
<html>
<script src="harness.js"></script>
<fieldset id="fs">
<legend>Display</legend>
<input type=radio name=a>
<fieldset>
<button>Click!</button>
</fieldset>
<keygen name="key">
<textarea>
A
</textarea>
<select>
<option value="1"> A </option>
<option value="2" selected> B </option>
</select>
<form onsubmit="return false" oninput="o.value = a.valueAsNumber + b.valueAsNumber">
<input name=a type=number step=any> +
<input name=b type=number step=any> =
<output name=c for="a b"></output>
</form>
<figure>
<object type="application/x-java-applet">
<param name="code" value="MyJavaClass">
<p>You do not have Java available, or it is disabled.</p>
</object>
<figcaption>My Java Clock</figcaption>
</figure>
</fieldset>
<script>
var fs = document.getElementById("fs");
is(fs.elements.length, 10);
is_a(fs.elements[0], HTMLInputElement);
is_a(fs.elements[1], HTMLFieldSetElement);
is_a(fs.elements[2], HTMLButtonElement);
is_a(fs.elements[3], HTMLUnknownElement);
is_a(fs.elements[4], HTMLTextAreaElement);
is_a(fs.elements[5], HTMLSelectElement);
is_a(fs.elements[6], HTMLInputElement);
is_a(fs.elements[7], HTMLInputElement);
is_a(fs.elements[8], HTMLOutputElement);
is_a(fs.elements[9], HTMLObjectElement);
finish();
</script>
</html>