Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7829 - frewsxcv:htmltablecellelement-cellindex, r=Ms2ger

Browse source 
Implement HTMLTableCellElement::CellIndex

Extracted from #6936

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7829)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-14 07:39:24 -06:00
commit 55769b2fbf
5 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/htmltablecellelement.rs
View file

@ -5,7 +5,11 @@
use cssparser::RGBA;
use dom::attr::{Attr, AttrValue};
use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods;
use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableCellElementDerived};
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::codegen::InheritTypes::HTMLElementCast;
use dom::bindings::codegen::InheritTypes::HTMLTableCellElementDerived;
use dom::bindings::codegen::InheritTypes::HTMLTableRowElementDerived;
use dom::bindings::codegen::InheritTypes::NodeCast;
use dom::bindings::js::LayoutJS;
use dom::document::Document;
use dom::element::{AttributeMutation, ElementTypeId};
@ -78,6 +82,20 @@ impl HTMLTableCellElementMethods for HTMLTableCellElement {
// https://html.spec.whatwg.org/multipage/#dom-tdth-colspan
make_uint_setter!(SetColSpan, "colspan");
// https://html.spec.whatwg.org/multipage/#dom-tdth-cellindex
fn CellIndex(&self) -> i32 {
let self_node = NodeCast::from_ref(self);
let parent_children = match self_node.GetParentNode() {
Some(ref parent_node) if parent_node.is_htmltablerowelement() => parent_node.children(),
_ => return -1,
};
parent_children.filter(|c| c.is_htmltablecellelement())
.position(|c| c.r() == self_node)
.map(|p| p as i32).unwrap_or(-1)
}
}

2
components/script/dom/webidls/HTMLTableCellElement.webidl
View file

@ -9,7 +9,7 @@ interface HTMLTableCellElement : HTMLElement {
attribute unsigned long colSpan;
// attribute unsigned long rowSpan;
//[PutForwards=value] readonly attribute DOMSettableTokenList headers;
//readonly attribute long cellIndex;
readonly attribute long cellIndex;
// also has obsolete members
};

9
tests/wpt/metadata/html/dom/interfaces.html.ini
View file

@ -4770,9 +4770,6 @@
[HTMLTableCellElement interface: document.createElement("td") must inherit property "headers" with the proper type (2)]
expected: FAIL
[HTMLTableCellElement interface: document.createElement("td") must inherit property "cellIndex" with the proper type (3)]
expected: FAIL
[HTMLTableCellElement interface: document.createElement("td") must inherit property "align" with the proper type (4)]
expected: FAIL
@ -4833,9 +4830,6 @@
[HTMLTableCellElement interface: document.createElement("th") must inherit property "headers" with the proper type (2)]
expected: FAIL
[HTMLTableCellElement interface: document.createElement("th") must inherit property "cellIndex" with the proper type (3)]
expected: FAIL
[HTMLTableCellElement interface: document.createElement("th") must inherit property "align" with the proper type (4)]
expected: FAIL
@ -4872,9 +4866,6 @@
[HTMLTableCellElement interface: attribute headers]
expected: FAIL
[HTMLTableCellElement interface: attribute cellIndex]
expected: FAIL
[HTMLTableCellElement interface: attribute align]
expected: FAIL

17
tests/wpt/metadata/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html.ini
View file

@ -1,17 +0,0 @@
[cellIndex.html]
type: testharness
[cellIndex should exist.]
expected: FAIL
[For cells without a parent, cellIndex should be -1.]
expected: FAIL
[For cells whose parent is not a tr, cellIndex should be -1.]
expected: FAIL
[For cells whose parent is not a HTML tr, cellIndex should be -1.]
expected: FAIL
[For cells whose parent is a tr, cellIndex should be the index.]
expected: FAIL

9
tests/wpt/web-platform-tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html
View file

@ -38,4 +38,13 @@ test(function() {
var td = tr.appendChild(document.createElement("td"));
assert_equals(td.cellIndex, 1);
}, "For cells whose parent is a tr, cellIndex should be the index.")
test(function() {
var tr = document.createElement("tr");
var th = tr.appendChild(document.createElement("th"));
assert_equals(th.cellIndex, 0);
tr.appendChild(document.createElement("div"));
tr.appendChild(document.createTextNode("Hello World"));
var td = tr.appendChild(document.createElement("td"));
assert_equals(td.cellIndex, 1)
}, "For cells whose parent is a tr with non td/th sibling, cellIndex should skip those non td/th siblings.")
</script>