diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/script/dom/bindings/codegen/Bindings.conf | 1 | ||||
-rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 1 | ||||
-rw-r--r-- | src/components/script/dom/bindings/codegen/HTMLFieldSetElement.webidl | 32 | ||||
-rw-r--r-- | src/components/script/dom/bindings/node.rs | 4 | ||||
-rw-r--r-- | src/components/script/dom/element.rs | 6 | ||||
-rw-r--r-- | src/components/script/dom/htmlfieldsetelement.rs | 72 | ||||
-rw-r--r-- | src/components/script/html/hubbub_html_parser.rs | 7 | ||||
-rw-r--r-- | src/components/script/script.rc | 2 |
8 files changed, 122 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index a8ba7758bc8..2066fae2fba 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -563,6 +563,7 @@ addHTMLElement('HTMLDirectoryElement') addHTMLElement('HTMLDListElement') addHTMLElement('HTMLElement') addHTMLElement('HTMLEmbedElement') +addHTMLElement('HTMLFieldSetElement') addHTMLElement('HTMLFormElement') addHTMLElement('HTMLHeadElement') addHTMLElement('HTMLHtmlElement') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index c7d0a4b1772..8dfae4857dc 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4631,6 +4631,7 @@ class CGBindingRoot(CGThing): 'dom::htmldirectoryelement::HTMLDirectoryElement', 'dom::htmlelement::HTMLElement', #XXXjdm 'dom::htmlembedelement::HTMLEmbedElement', #XXXjdm + 'dom::htmlfieldsetelement::HTMLFieldSetElement', #XXXjdm 'dom::htmldocument::HTMLDocument', #XXXjdm 'dom::htmlhrelement::HTMLHRElement', 'dom::htmliframeelement::HTMLIFrameElement', #XXXjdm diff --git a/src/components/script/dom/bindings/codegen/HTMLFieldSetElement.webidl b/src/components/script/dom/bindings/codegen/HTMLFieldSetElement.webidl new file mode 100644 index 00000000000..16eee1f9323 --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLFieldSetElement.webidl @@ -0,0 +1,32 @@ +/* -*- 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-fieldset-element + * + * © 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 HTMLFieldSetElement : HTMLElement { + [SetterThrows] + attribute boolean disabled; + readonly attribute HTMLFormElement? form; + [SetterThrows] + attribute DOMString name; + + readonly attribute DOMString type; + + readonly attribute HTMLCollection elements; + + readonly attribute boolean willValidate; + readonly attribute ValidityState validity; + readonly attribute DOMString validationMessage; + + boolean checkValidity(); + + void setCustomValidity(DOMString error); +}; diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 972f0119809..e685204a916 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -12,7 +12,7 @@ use dom::element::{HTMLElementTypeId, HTMLBodyElementTypeId, HTMLBRElementTypeId, HTMLButtonElementTypeId, HTMLCanvasElementTypeId, HTMLDataElementTypeId, HTMLDataListElementTypeId, HTMLDirectoryElementTypeId, HTMLDivElementTypeId, HTMLEmbedElementTypeId, - HTMLHeadElementTypeId, + HTMLFieldSetElementTypeId, HTMLHeadElementTypeId, HTMLHRElementTypeId, HTMLHtmlElementTypeId, HTMLIframeElementTypeId, HTMLImageElementTypeId, HTMLInputElementTypeId, HTMLLIElementTypeId, HTMLLinkElementTypeId, HTMLMetaElementTypeId, HTMLOListElementTypeId, @@ -40,6 +40,7 @@ use dom::htmldatalistelement::HTMLDataListElement; use dom::htmldirectoryelement::HTMLDirectoryElement; use dom::htmldlistelement::HTMLDListElement; use dom::htmlembedelement::HTMLEmbedElement; +use dom::htmlfieldsetelement::HTMLFieldSetElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; use dom::htmlinputelement::HTMLInputElement; @@ -141,6 +142,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject ElementNodeTypeId(HTMLDListElementTypeId) => generate_element!(HTMLDListElement), ElementNodeTypeId(HTMLDivElementTypeId) => generate_element!(HTMLDivElement), ElementNodeTypeId(HTMLEmbedElementTypeId) => generate_element!(HTMLEmbedElement), + ElementNodeTypeId(HTMLFieldSetElementTypeId) => generate_element!(HTMLFieldSetElement), ElementNodeTypeId(HTMLHeadElementTypeId) => generate_element!(HTMLHeadElement), ElementNodeTypeId(HTMLHRElementTypeId) => generate_element!(HTMLHRElement), ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement), diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index d58154dd519..6fa81474944 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -11,7 +11,7 @@ use dom::bindings::codegen::{HTMLAnchorElementBinding, HTMLAppletElementBinding, HTMLDataElementBinding, HTMLDataListElementBinding, HTMLDirectoryElementBinding, HTMLDListElementBinding, HTMLDivElementBinding, HTMLEmbedElementBinding, - HTMLHeadElementBinding, + HTMLFieldSetElementBinding, HTMLHeadElementBinding, HTMLHRElementBinding, HTMLHtmlElementBinding, HTMLIFrameElementBinding, HTMLImageElementBinding, HTMLInputElementBinding, HTMLLIElementBinding, @@ -43,6 +43,7 @@ use dom::htmldirectoryelement::HTMLDirectoryElement; use dom::htmldlistelement::HTMLDListElement; use dom::htmlelement::HTMLElement; use dom::htmlembedelement::HTMLEmbedElement; +use dom::htmlfieldsetelement::HTMLFieldSetElement; use dom::htmlhrelement::HTMLHRElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; @@ -118,6 +119,7 @@ pub enum ElementTypeId { HTMLDListElementTypeId, HTMLDivElementTypeId, HTMLEmbedElementTypeId, + HTMLFieldSetElementTypeId, HTMLFontElementTypeId, HTMLFormElementTypeId, HTMLHRElementTypeId, @@ -256,6 +258,8 @@ generate_cacheable_wrapper!(HTMLDivElement, HTMLDivElementBinding::Wrap) generate_binding_object!(HTMLDivElement) generate_cacheable_wrapper!(HTMLEmbedElement, HTMLEmbedElementBinding::Wrap) generate_binding_object!(HTMLEmbedElement) +generate_cacheable_wrapper!(HTMLFieldSetElement, HTMLFieldSetElementBinding::Wrap) +generate_binding_object!(HTMLFieldSetElement) generate_cacheable_wrapper!(HTMLIFrameElement, HTMLIFrameElementBinding::Wrap) generate_binding_object!(HTMLIFrameElement) generate_cacheable_wrapper!(HTMLImageElement, HTMLImageElementBinding::Wrap) diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs new file mode 100644 index 00000000000..2005e46d7d2 --- /dev/null +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -0,0 +1,72 @@ +/* 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, CacheableWrapper}; +use dom::htmlcollection::HTMLCollection; +use dom::htmlelement::HTMLElement; +use dom::node::{AbstractNode, ScriptView}; +use dom::validitystate::ValidityState; + +use js::jsapi::{JSContext, JSObject}; + +pub struct HTMLFieldSetElement { + parent: HTMLElement +} + +impl HTMLFieldSetElement { + pub fn Disabled(&self) -> bool { + false + } + + pub fn SetDisabled(&mut self, _disabled: bool, _rv: &mut ErrorResult) { + } + + pub fn GetForm(&self) -> Option<AbstractNode<ScriptView>> { + None + } + + pub fn Name(&self) -> DOMString { + null_string + } + + pub fn SetName(&mut self, _name: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn Type(&self) -> DOMString { + null_string + } + + fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { + let doc = self.parent.parent.parent.owner_doc.unwrap(); + let win = doc.with_base(|doc| doc.window.unwrap()); + let cx = unsafe {(*win.page).js_info.get_ref().js_compartment.cx.ptr}; + let cache = win.get_wrappercache(); + let scope = cache.get_wrapper(); + (scope, cx) + } + + pub fn Elements(&self) -> @mut HTMLCollection { + let (scope, cx) = self.get_scope_and_cx(); + HTMLCollection::new(~[], cx, scope) + } + + pub fn WillValidate(&self) -> bool { + false + } + + pub fn Validity(&self) -> @mut ValidityState { + @mut ValidityState::valid() + } + + pub fn ValidationMessage(&self) -> DOMString { + null_string + } + + pub fn CheckValidity(&self) -> bool { + false + } + + pub fn SetCustomValidity(&mut self, _error: &DOMString) { + } +}
\ 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 2268b2e2ae5..686fe185bbb 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -7,7 +7,8 @@ use dom::element::{HTMLElementTypeId, HTMLAreaElementTypeId, HTMLBaseElementTypeId, HTMLBodyElementTypeId, HTMLBRElementTypeId, HTMLButtonElementTypeId, HTMLCanvasElementTypeId, HTMLDataElementTypeId, HTMLDataListElementTypeId, HTMLDivElementTypeId, - HTMLDirectoryElementTypeId, HTMLDListElementTypeId, HTMLFontElementTypeId, + HTMLDirectoryElementTypeId, HTMLDListElementTypeId, HTMLEmbedElementTypeId, + HTMLFieldSetElementTypeId, HTMLFontElementTypeId, HTMLFormElementTypeId, HTMLHRElementTypeId, HTMLHeadElementTypeId, HTMLHtmlElementTypeId, HTMLImageElementTypeId, HTMLIframeElementTypeId, HTMLInputElementTypeId, HTMLLinkElementTypeId, HTMLLIElementTypeId, @@ -40,6 +41,8 @@ use dom::htmldataelement::HTMLDataElement; use dom::htmldatalistelement::HTMLDataListElement; use dom::htmldirectoryelement::HTMLDirectoryElement; use dom::htmldlistelement::HTMLDListElement; +use dom::htmlembedelement::HTMLEmbedElement; +use dom::htmlfieldsetelement::HTMLFieldSetElement; use dom::htmlhrelement::HTMLHRElement; use dom::htmliframeelement::{IFrameSize, HTMLIFrameElement}; use dom::htmlimageelement::HTMLImageElement; @@ -256,6 +259,8 @@ fn build_element_from_tag(cx: *JSContext, tag: &str) -> AbstractNode<ScriptView> handle_element!(cx, tag, "directory",HTMLDirectoryElementTypeId, HTMLDirectoryElement, []); handle_element!(cx, tag, "div", HTMLDivElementTypeId, HTMLDivElement, []); handle_element!(cx, tag, "dl", HTMLDListElementTypeId, HTMLDListElement, []); + handle_element!(cx, tag, "embed", HTMLEmbedElementTypeId, HTMLEmbedElement, []); + handle_element!(cx, tag, "fieldset",HTMLFieldSetElementTypeId, HTMLFieldSetElement, []); handle_element!(cx, tag, "font", HTMLFontElementTypeId, HTMLFontElement, []); handle_element!(cx, tag, "form", HTMLFormElementTypeId, HTMLFormElement, []); handle_element!(cx, tag, "hr", HTMLHRElementTypeId, HTMLHRElement, []); diff --git a/src/components/script/script.rc b/src/components/script/script.rc index 9158716c888..52e82349149 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -59,6 +59,7 @@ pub mod dom { pub mod HTMLDocumentBinding; pub mod HTMLElementBinding; pub mod HTMLEmbedElementBinding; + pub mod HTMLFieldSetElementBinding; pub mod HTMLHeadElementBinding; pub mod HTMLHRElementBinding; pub mod HTMLHtmlElementBinding; @@ -123,6 +124,7 @@ pub mod dom { pub mod htmldocument; pub mod htmlelement; pub mod htmlembedelement; + pub mod htmlfieldsetelement; pub mod htmlhrelement; pub mod htmliframeelement; pub mod htmlimageelement; |