Implement HTMLTableDataCellElement & HTMLTableHeaderCellElement.

This commit is contained in:
Tetsuharu OHZEKI 2013-10-15 22:37:06 +09:00
parent 74d84ba099
commit 0de35fdc2f
12 changed files with 100 additions and 4 deletions

View file

@ -633,6 +633,8 @@ addHTMLElement('HTMLStyleElement')
addHTMLElement('HTMLTableCaptionElement') addHTMLElement('HTMLTableCaptionElement')
addHTMLElement('HTMLTableElement') addHTMLElement('HTMLTableElement')
addHTMLElement('HTMLTableCellElement') addHTMLElement('HTMLTableCellElement')
addHTMLElement('HTMLTableDataCellElement')
addHTMLElement('HTMLTableHeaderCellElement')
addHTMLElement('HTMLTableColElement') addHTMLElement('HTMLTableColElement')
addHTMLElement('HTMLTableRowElement') addHTMLElement('HTMLTableRowElement')
addHTMLElement('HTMLTableSectionElement') addHTMLElement('HTMLTableSectionElement')

View file

@ -0,0 +1,17 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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
* http://www.whatwg.org/specs/web-apps/current-work/
* (2013-10-14)
*
* © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
* Opera Software ASA. You are granted a license to use, reproduce
* and create derivative works of this document.
*/
interface HTMLTableDataCellElement : HTMLTableCellElement {
// also has obsolete members
};

View file

@ -0,0 +1,22 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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
* http://www.whatwg.org/specs/web-apps/current-work/
* (2013-10-14)
*
* © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
* Opera Software ASA. You are granted a license to use, reproduce
* and create derivative works of this document.
*/
interface HTMLTableHeaderCellElement : HTMLTableCellElement {
/* TODO:
attribute DOMString scope;
attribute DOMString abbr;
attribute DOMString sorted;
void sort();
*/
};

View file

@ -299,6 +299,12 @@ generate_traceable_htmlelement!(HTMLTableCaptionElement)
generate_cacheable_wrapper_htmlelement!(HTMLTableCellElement, HTMLTableCellElementBinding::Wrap) generate_cacheable_wrapper_htmlelement!(HTMLTableCellElement, HTMLTableCellElementBinding::Wrap)
generate_binding_object_htmlelement!(HTMLTableCellElement) generate_binding_object_htmlelement!(HTMLTableCellElement)
generate_traceable_htmlelement!(HTMLTableCellElement) generate_traceable_htmlelement!(HTMLTableCellElement)
generate_cacheable_wrapper_htmlelement!(HTMLTableDataCellElement, HTMLTableDataCellElementBinding::Wrap)
generate_binding_object_htmlelement!(HTMLTableDataCellElement)
generate_traceable_htmlelement!(HTMLTableDataCellElement)
generate_cacheable_wrapper_htmlelement!(HTMLTableHeaderCellElement, HTMLTableHeaderCellElementBinding::Wrap)
generate_binding_object_htmlelement!(HTMLTableHeaderCellElement)
generate_traceable_htmlelement!(HTMLTableHeaderCellElement)
generate_cacheable_wrapper_htmlelement!(HTMLTableColElement, HTMLTableColElementBinding::Wrap) generate_cacheable_wrapper_htmlelement!(HTMLTableColElement, HTMLTableColElementBinding::Wrap)
generate_binding_object_htmlelement!(HTMLTableColElement) generate_binding_object_htmlelement!(HTMLTableColElement)
generate_traceable_htmlelement!(HTMLTableColElement) generate_traceable_htmlelement!(HTMLTableColElement)

View file

@ -77,6 +77,8 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
ElementNodeTypeId(HTMLStyleElementTypeId) => generate_element!(HTMLStyleElement), ElementNodeTypeId(HTMLStyleElementTypeId) => generate_element!(HTMLStyleElement),
ElementNodeTypeId(HTMLTableElementTypeId) => generate_element!(HTMLTableElement), ElementNodeTypeId(HTMLTableElementTypeId) => generate_element!(HTMLTableElement),
ElementNodeTypeId(HTMLTableCellElementTypeId) => generate_element!(HTMLTableCellElement), ElementNodeTypeId(HTMLTableCellElementTypeId) => generate_element!(HTMLTableCellElement),
ElementNodeTypeId(HTMLTableDataCellElementTypeId) => generate_element!(HTMLTableDataCellElement),
ElementNodeTypeId(HTMLTableHeaderCellElementTypeId) => generate_element!(HTMLTableHeaderCellElement),
ElementNodeTypeId(HTMLTableCaptionElementTypeId) => generate_element!(HTMLTableCaptionElement), ElementNodeTypeId(HTMLTableCaptionElementTypeId) => generate_element!(HTMLTableCaptionElement),
ElementNodeTypeId(HTMLTableColElementTypeId) => generate_element!(HTMLTableColElement), ElementNodeTypeId(HTMLTableColElementTypeId) => generate_element!(HTMLTableColElement),
ElementNodeTypeId(HTMLTableRowElementTypeId) => generate_element!(HTMLTableRowElement), ElementNodeTypeId(HTMLTableRowElementTypeId) => generate_element!(HTMLTableRowElement),

View file

@ -106,6 +106,8 @@ pub enum ElementTypeId {
HTMLTableElementTypeId, HTMLTableElementTypeId,
HTMLTableCaptionElementTypeId, HTMLTableCaptionElementTypeId,
HTMLTableCellElementTypeId, HTMLTableCellElementTypeId,
HTMLTableDataCellElementTypeId,
HTMLTableHeaderCellElementTypeId,
HTMLTableColElementTypeId, HTMLTableColElementTypeId,
HTMLTableRowElementTypeId, HTMLTableRowElementTypeId,
HTMLTableSectionElementTypeId, HTMLTableSectionElementTypeId,

View file

@ -3,12 +3,22 @@
* 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::utils::{DOMString, ErrorResult}; use dom::bindings::utils::{DOMString, ErrorResult};
use dom::document::AbstractDocument;
use dom::element::ElementTypeId;
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
pub struct HTMLTableCellElement { pub struct HTMLTableCellElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
} }
impl HTMLTableCellElement {
pub fn new(type_id: ElementTypeId, tag_name: ~str, document: AbstractDocument) -> HTMLTableCellElement {
HTMLTableCellElement {
htmlelement: HTMLElement::new(type_id, tag_name, document)
}
}
}
impl HTMLTableCellElement { impl HTMLTableCellElement {
pub fn ColSpan(&self) -> u32 { pub fn ColSpan(&self) -> u32 {
0 0

View file

@ -0,0 +1,9 @@
/* 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::htmltablecellelement::HTMLTableCellElement;
pub struct HTMLTableDataCellElement {
htmlelement: HTMLTableCellElement,
}

View file

@ -0,0 +1,9 @@
/* 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::htmltablecellelement::HTMLTableCellElement;
pub struct HTMLTableHeaderCellElement {
htmlelement: HTMLTableCellElement,
}

View file

@ -69,6 +69,18 @@ macro_rules! handle_htmlmediaelement(
} }
) )
) )
macro_rules! handle_htmltablecellelement(
($cx: expr, $tag:expr, $string:expr, $type_id:expr, $ctor:ident) => (
if eq_slice($tag, $string) {
let _element = @$ctor {
htmlelement: HTMLTableCellElement::new($type_id, ($tag).to_str(), document)
};
unsafe {
return Node::as_abstract_node(cx, _element);
}
}
)
)
pub struct JSFile { pub struct JSFile {
@ -260,8 +272,6 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
handle_element!(cx, tag, "style", HTMLStyleElementTypeId, HTMLStyleElement, []); handle_element!(cx, tag, "style", HTMLStyleElementTypeId, HTMLStyleElement, []);
handle_element!(cx, tag, "table", HTMLTableElementTypeId, HTMLTableElement, []); handle_element!(cx, tag, "table", HTMLTableElementTypeId, HTMLTableElement, []);
handle_element!(cx, tag, "caption", HTMLTableCaptionElementTypeId, HTMLTableCaptionElement, []); handle_element!(cx, tag, "caption", HTMLTableCaptionElementTypeId, HTMLTableCaptionElement, []);
handle_element!(cx, tag, "th", HTMLTableCellElementTypeId, HTMLTableCellElement, []);
handle_element!(cx, tag, "td", HTMLTableCellElementTypeId, HTMLTableCellElement, []);
handle_element!(cx, tag, "col", HTMLTableColElementTypeId, HTMLTableColElement, []); handle_element!(cx, tag, "col", HTMLTableColElementTypeId, HTMLTableColElement, []);
handle_element!(cx, tag, "colgroup",HTMLTableColElementTypeId, HTMLTableColElement, []); handle_element!(cx, tag, "colgroup",HTMLTableColElementTypeId, HTMLTableColElement, []);
handle_element!(cx, tag, "tbody", HTMLTableSectionElementTypeId, HTMLTableSectionElement, []); handle_element!(cx, tag, "tbody", HTMLTableSectionElementTypeId, HTMLTableSectionElement, []);
@ -293,6 +303,9 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
handle_htmlmediaelement!(cx, tag, "audio", HTMLAudioElementTypeId, HTMLAudioElement); handle_htmlmediaelement!(cx, tag, "audio", HTMLAudioElementTypeId, HTMLAudioElement);
handle_htmlmediaelement!(cx, tag, "video", HTMLVideoElementTypeId, HTMLVideoElement); handle_htmlmediaelement!(cx, tag, "video", HTMLVideoElementTypeId, HTMLVideoElement);
handle_htmltablecellelement!(cx, tag, "td", HTMLTableDataCellElementTypeId, HTMLTableDataCellElement);
handle_htmltablecellelement!(cx, tag, "th", HTMLTableHeaderCellElementTypeId, HTMLTableHeaderCellElement);
let element = @HTMLUnknownElement { let element = @HTMLUnknownElement {
htmlelement: HTMLElement::new(HTMLUnknownElementTypeId, tag.to_str(), document) htmlelement: HTMLElement::new(HTMLUnknownElementTypeId, tag.to_str(), document)
}; };

View file

@ -113,6 +113,8 @@ pub mod dom {
pub mod htmltableelement; pub mod htmltableelement;
pub mod htmltablecaptionelement; pub mod htmltablecaptionelement;
pub mod htmltablecellelement; pub mod htmltablecellelement;
pub mod htmltabledatacellelement;
pub mod htmltableheadercellelement;
pub mod htmltablecolelement; pub mod htmltablecolelement;
pub mod htmltablerowelement; pub mod htmltablerowelement;
pub mod htmltablesectionelement; pub mod htmltablesectionelement;

View file

@ -204,19 +204,21 @@ window.alert(tags.length);
window.alert(tags[0].tagName); window.alert(tags[0].tagName);
window.alert(tags[0] instanceof HTMLQuoteElement); window.alert(tags[0] instanceof HTMLQuoteElement);
window.alert("HTMLTableCellElement:"); window.alert("HTMLTableHeaderCellElement:");
let tags = document.getElementsByTagName("th"); let tags = document.getElementsByTagName("th");
window.alert(tags); window.alert(tags);
window.alert(tags.length); window.alert(tags.length);
window.alert(tags[0].tagName); window.alert(tags[0].tagName);
window.alert(tags[0] instanceof HTMLTableCellElement); window.alert(tags[0] instanceof HTMLTableCellElement);
window.alert(tags[0] instanceof HTMLTableHeaderCellElement);
window.alert("HTMLTableCellElement:"); window.alert("HTMLTableDataCellElement:");
let tags = document.getElementsByTagName("td"); let tags = document.getElementsByTagName("td");
window.alert(tags); window.alert(tags);
window.alert(tags.length); window.alert(tags.length);
window.alert(tags[0].tagName); window.alert(tags[0].tagName);
window.alert(tags[0] instanceof HTMLTableCellElement); window.alert(tags[0] instanceof HTMLTableCellElement);
window.alert(tags[0] instanceof HTMLTableDataCellElement);
window.alert("HTMLTableColElement"); window.alert("HTMLTableColElement");
let tagList = ["col", "colgroup"]; let tagList = ["col", "colgroup"];