diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 227989c8ead..01c1ec88f42 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -554,6 +554,7 @@ addHTMLElement('HTMLHtmlElement') addHTMLElement('HTMLHRElement') addHTMLElement('HTMLIFrameElement') addHTMLElement('HTMLImageElement') +addHTMLElement('HTMLOListElement') addHTMLElement('HTMLParagraphElement') addHTMLElement('HTMLScriptElement') addHTMLElement('HTMLSpanElement') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 99bcef1c970..9a2fa981e60 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4624,6 +4624,7 @@ class CGBindingRoot(CGThing): 'dom::htmlhrelement::HTMLHRElement', 'dom::htmliframeelement::HTMLIFrameElement', #XXXjdm 'dom::htmlimageelement::HTMLImageElement', #XXXjdm + 'dom::htmlolistelement::HTMLOListElement', 'dom::htmlscriptelement::HTMLScriptElement', 'dom::bindings::utils::*', 'dom::bindings::conversions::*', diff --git a/src/components/script/dom/bindings/codegen/HTMLOListElement.webidl b/src/components/script/dom/bindings/codegen/HTMLOListElement.webidl new file mode 100644 index 00000000000..f41abf3eaa3 --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLOListElement.webidl @@ -0,0 +1,29 @@ +/* -*- 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/#the-ol-element + * http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis + * + * © 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. + */ + +// http://www.whatwg.org/specs/web-apps/current-work/#the-ol-element +interface HTMLOListElement : HTMLElement { + [SetterThrows] + attribute boolean reversed; + [SetterThrows] + attribute long start; + [SetterThrows] + attribute DOMString type; +}; + +// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis +partial interface HTMLOListElement { + [SetterThrows] + attribute boolean compact; +}; diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index f645a30294a..c6c5e47f975 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -10,6 +10,7 @@ use dom::element::{HTMLHeadElementTypeId, HTMLHtmlElementTypeId, HTMLAnchorEleme use dom::element::{HTMLDivElementTypeId, HTMLImageElementTypeId, HTMLSpanElementTypeId}; use dom::element::{HTMLBodyElementTypeId, HTMLHRElementTypeId, HTMLIframeElementTypeId}; use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId}; +use dom::element::{HTMLOListElementTypeId}; use dom::element::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement}; use dom::element::{HTMLParagraphElement}; use dom::htmlanchorelement::HTMLAnchorElement; @@ -17,6 +18,7 @@ use dom::htmlbodyelement::HTMLBodyElement; use dom::htmlhrelement::HTMLHRElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; +use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; use dom::node::{DoctypeNodeTypeId, ScriptView, Text}; @@ -91,6 +93,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement), ElementNodeTypeId(HTMLIframeElementTypeId) => generate_element!(HTMLIFrameElement), ElementNodeTypeId(HTMLImageElementTypeId) => generate_element!(HTMLImageElement), + ElementNodeTypeId(HTMLOListElementTypeId) => generate_element!(HTMLOListElement), ElementNodeTypeId(HTMLParagraphElementTypeId) => generate_element!(HTMLParagraphElement), ElementNodeTypeId(HTMLScriptElementTypeId) => generate_element!(HTMLScriptElement), ElementNodeTypeId(HTMLSpanElementTypeId) => generate_element!(HTMLSpanElement), diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 812cff18ec9..a85e6bbc41e 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -617,7 +617,7 @@ pub extern fn ThrowingConstructor(_cx: *JSContext, _argc: uint, _vp: *JSVal) -> } pub fn initialize_global(global: *JSObject) { - let protoArray = @mut ([0 as *JSObject, ..41]); + let protoArray = @mut ([0 as *JSObject, ..42]); assert!(protoArray.len() == PrototypeList::id::_ID_Count as uint); unsafe { //XXXjdm we should be storing the box pointer instead of the inner diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 2d169133cf6..6d0fdb4fcf0 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::{HTMLAnchorElementBinding, HTMLBodyElementBinding}; use dom::bindings::codegen::{HTMLHRElementBinding, HTMLIFrameElementBinding}; use dom::bindings::codegen::{HTMLParagraphElementBinding, HTMLScriptElementBinding}; use dom::bindings::codegen::{HTMLDivElementBinding, HTMLSpanElementBinding}; -use dom::bindings::codegen::{HTMLImageElementBinding}; +use dom::bindings::codegen::{HTMLImageElementBinding, HTMLOListElementBinding}; use dom::bindings::utils::{null_string, str}; use dom::bindings::utils::{BindingObject, CacheableWrapper, DOMString, ErrorResult, WrapperCache}; use dom::clientrect::ClientRect; @@ -21,6 +21,7 @@ use dom::htmlelement::HTMLElement; use dom::htmlhrelement::HTMLHRElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; +use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::node::{ElementNodeTypeId, Node, ScriptView, AbstractNode}; use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery}; @@ -112,7 +113,6 @@ pub struct HTMLItalicElement { parent: HTMLElement } pub struct HTMLLinkElement { parent: HTMLElement } pub struct HTMLListItemElement { parent: HTMLElement } pub struct HTMLMetaElement { parent: HTMLElement } -pub struct HTMLOListElement { parent: HTMLElement } pub struct HTMLOptionElement { parent: HTMLElement } pub struct HTMLParagraphElement { parent: HTMLElement } pub struct HTMLSectionElement { parent: HTMLElement } @@ -196,6 +196,8 @@ generate_cacheable_wrapper!(HTMLIFrameElement, HTMLIFrameElementBinding::Wrap) generate_binding_object!(HTMLIFrameElement) generate_cacheable_wrapper!(HTMLImageElement, HTMLImageElementBinding::Wrap) generate_binding_object!(HTMLImageElement) +generate_cacheable_wrapper!(HTMLOListElement, HTMLOListElementBinding::Wrap) +generate_binding_object!(HTMLOListElement) generate_cacheable_wrapper!(HTMLParagraphElement, HTMLParagraphElementBinding::Wrap) generate_binding_object!(HTMLParagraphElement) generate_cacheable_wrapper!(HTMLScriptElement, HTMLScriptElementBinding::Wrap) @@ -203,7 +205,6 @@ generate_binding_object!(HTMLScriptElement) generate_cacheable_wrapper!(HTMLSpanElement, HTMLSpanElementBinding::Wrap) generate_binding_object!(HTMLSpanElement) - // // Fancier elements // diff --git a/src/components/script/dom/htmlolistelement.rs b/src/components/script/dom/htmlolistelement.rs new file mode 100644 index 00000000000..970bfa9e7c9 --- /dev/null +++ b/src/components/script/dom/htmlolistelement.rs @@ -0,0 +1,40 @@ +/* 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::bindings::utils::{DOMString, null_string, ErrorResult}; +use dom::htmlelement::HTMLElement; + +pub struct HTMLOListElement { + parent: HTMLElement, +} + +impl HTMLOListElement { + pub fn Reversed(&self) -> bool { + false + } + + pub fn SetReversed(&self, _reversed: bool, _rv: &mut ErrorResult) { + } + + pub fn Start(&self) -> i32 { + 0 + } + + pub fn SetStart(&mut self, _start: i32, _rv: &mut ErrorResult) { + } + + pub fn Type(&self) -> DOMString { + null_string + } + + pub fn SetType(&mut self, _type: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn Compact(&self) -> bool { + false + } + + pub fn SetCompact(&self, _compact: bool, _rv: &mut ErrorResult) { + } +} \ No newline at end of file diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index c26d3b3247e..d39c84477ee 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -20,7 +20,7 @@ use dom::element::{HTMLAsideElement, HTMLBRElement, HTMLHeadElement, HTMLHeadingElement, HTMLHtmlElement, HTMLInputElement, HTMLItalicElement, HTMLLinkElement, HTMLListItemElement, HTMLMetaElement, - HTMLOListElement, HTMLOptionElement, HTMLParagraphElement, + HTMLOptionElement, HTMLParagraphElement, HTMLSectionElement, HTMLSelectElement, HTMLSmallElement, HTMLSpanElement, HTMLStyleElement, HTMLTableBodyElement, HTMLTableCellElement, HTMLTableElement, HTMLTableRowElement, @@ -32,6 +32,7 @@ use dom::htmlbodyelement::HTMLBodyElement; use dom::htmlhrelement::HTMLHRElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; +use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::element::{Element, Attr}; use dom::htmlelement::HTMLElement; diff --git a/src/components/script/script.rc b/src/components/script/script.rc index ac3519a2c0d..debe2bced16 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -53,6 +53,7 @@ pub mod dom { pub mod HTMLHtmlElementBinding; pub mod HTMLIFrameElementBinding; pub mod HTMLImageElementBinding; + pub mod HTMLOListElementBinding; pub mod HTMLParagraphElementBinding; pub mod HTMLScriptElementBinding; pub mod HTMLSpanElementBinding; @@ -84,6 +85,7 @@ pub mod dom { pub mod htmlhrelement; pub mod htmliframeelement; pub mod htmlimageelement; + pub mod htmlolistelement; pub mod htmlscriptelement; pub mod mouseevent; pub mod node; diff --git a/src/test/html/test_bindings.html b/src/test/html/test_bindings.html index 6e041d5b948..ec6f78c9e08 100644 --- a/src/test/html/test_bindings.html +++ b/src/test/html/test_bindings.html @@ -19,5 +19,6 @@

pppppppppp

+
    diff --git a/src/test/html/test_bindings.js b/src/test/html/test_bindings.js index 6cee531029d..cdff29f53d4 100644 --- a/src/test/html/test_bindings.js +++ b/src/test/html/test_bindings.js @@ -133,6 +133,14 @@ window.alert(document.links[0]); window.alert(document.getElementsByTagName('iframe')[0]); window.alert(document.getElementsByTagName("body")[0]); + +window.alert("OList:"); +let tags = document.getElementsByTagName("ol"); +window.alert(tags); +window.alert(tags.length); +window.alert(tags[0]); +window.alert(tags[0].tagName); + //TODO: Doesn't work until we throw proper exceptions instead of returning 0 on // unwrap failure. /*try {