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

Auto merge of #10508 - g-k:insert-row, r=KiChjang

Browse source 
Insert row

Fixes #9269

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10508)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-19 01:38:38 +05:30
commit 19a5a9ad08
8 changed files with 100 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

65
components/script/dom/htmltableelement.rs
View file

@ -4,10 +4,11 @@
use cssparser::RGBA;
use dom::attr::{Attr, AttrValue};
use dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
use dom::bindings::codegen::Bindings::HTMLTableElementBinding;
use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods;
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::error::{Error, ErrorResult};
use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, LayoutJS, MutNullableHeap, Root, RootedReference};
use dom::document::Document;
@ -166,8 +167,8 @@ impl HTMLTableElementMethods for HTMLTableElement {
}
// https://html.spec.whatwg.org/multipage/#dom-table-createcaption
fn CreateCaption(&self) -> Root<HTMLElement> {
let caption = match self.GetCaption() {
fn CreateCaption(&self) -> Root<HTMLTableCaptionElement> {
match self.GetCaption() {
Some(caption) => caption,
None => {
let caption = HTMLTableCaptionElement::new(atom!("caption"),
@ -176,8 +177,7 @@ impl HTMLTableElementMethods for HTMLTableElement {
self.SetCaption(Some(caption.r()));
caption
}
};
Root::upcast(caption)
}
}
// https://html.spec.whatwg.org/multipage/#dom-table-deletecaption
@ -282,6 +282,61 @@ impl HTMLTableElementMethods for HTMLTableElement {
tbody
}
// https://html.spec.whatwg.org/multipage/#dom-table-insertrow
fn InsertRow(&self, index: i32) -> Fallible<Root<HTMLTableRowElement>> {
let rows = self.Rows();
let number_of_row_elements = rows.Length();
if index < -1 || index > number_of_row_elements as i32 {
return Err(Error::IndexSize);
}
let new_row = HTMLTableRowElement::new(atom!("tr"),
None,
document_from_node(self).r());
let node = self.upcast::<Node>();
if number_of_row_elements == 0 {
// append new row to last or new tbody in table
if let Some(last_tbody) = node.rev_children()
.filter_map(Root::downcast::<Element>)
.find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &atom!("tbody")) {
last_tbody.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
.expect("InsertRow failed to append first row.");
} else {
let tbody = self.CreateTBody();
node.AppendChild(tbody.upcast())
.expect("InsertRow failed to append new tbody.");
tbody.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
.expect("InsertRow failed to append first row.");
}
} else if index == number_of_row_elements as i32 || index == -1 {
// append new row to parent of last row in table
let last_row = rows.Item(number_of_row_elements - 1)
.expect("InsertRow failed to find last row in table.");
let last_row_parent =
last_row.upcast::<Node>().GetParentNode()
.expect("InsertRow failed to find parent of last row in table.");
last_row_parent.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
.expect("InsertRow failed to append last row.");
} else {
// insert new row before the index-th row in rows using the same parent
let ith_row = rows.Item(index as u32)
.expect("InsertRow failed to find a row in table.");
let ith_row_parent = ith_row.upcast::<Node>().GetParentNode()
.expect("InsertRow failed to find parent of a row in table.");
ith_row_parent.upcast::<Node>().InsertBefore(new_row.upcast::<Node>(), Some(ith_row.upcast::<Node>()))
.expect("InsertRow failed to append row");
}
Ok(new_row)
}
// https://html.spec.whatwg.org/multipage/#dom-table-bgcolor
make_getter!(BgColor, "bgcolor");

6
components/script/dom/webidls/HTMLTableElement.webidl
View file

@ -6,7 +6,7 @@
// https://html.spec.whatwg.org/multipage/#htmltableelement
interface HTMLTableElement : HTMLElement {
attribute HTMLTableCaptionElement? caption;
HTMLElement createCaption();
HTMLTableCaptionElement createCaption();
void deleteCaption();
[SetterThrows]
attribute HTMLTableSectionElement? tHead;
@ -19,10 +19,8 @@ interface HTMLTableElement : HTMLElement {
readonly attribute HTMLCollection tBodies;
HTMLTableSectionElement createTBody();
readonly attribute HTMLCollection rows;
//HTMLElement insertRow(optional long index = -1);
[Throws] HTMLTableRowElement insertRow(optional long index = -1);
//void deleteRow(long index);
// attribute boolean sortable;
//void stopSorting();
// also has obsolete members
};