diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-05-12 06:15:56 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-05-12 06:15:56 -0500 |
commit | f4381a6f1e4d42b316d67337a4c69913df2f51d2 (patch) | |
tree | 673f8f96d5e1ca55a129ce1f0e22ef446ae8ac7c /components | |
parent | ca9c703bf5e7b6664ab956e15c7f53534f0f32cd (diff) | |
parent | 656a8ee3c8ebfe4b73d7488b230823363a2f2d08 (diff) | |
download | servo-f4381a6f1e4d42b316d67337a4c69913df2f51d2.tar.gz servo-f4381a6f1e4d42b316d67337a4c69913df2f51d2.zip |
Auto merge of #6018 - Jinwoo-Song:select_attributes, r=Ms2ger
r? @jdm
cc @yichoi
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6018)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r-- | components/script/dom/htmlselectelement.rs | 37 | ||||
-rw-r--r-- | components/script/dom/webidls/HTMLSelectElement.webidl | 6 |
2 files changed, 34 insertions, 9 deletions
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 1d3ce090510..6b8e38e9161 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -2,17 +2,16 @@ * 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::attr::Attr; -use dom::attr::AttrHelpers; +use dom::attr::{Attr, AttrHelpers, AttrValue}; use dom::bindings::codegen::Bindings::HTMLSelectElementBinding; use dom::bindings::codegen::Bindings::HTMLSelectElementBinding::HTMLSelectElementMethods; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, NodeCast}; -use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLSelectElementDerived, HTMLFieldSetElementDerived}; +use dom::bindings::codegen::InheritTypes::{HTMLSelectElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::codegen::UnionTypes::HTMLElementOrLong; use dom::bindings::codegen::UnionTypes::HTMLOptionElementOrHTMLOptGroupElement; use dom::bindings::js::{JSRef, Rootable, Temporary}; use dom::document::Document; -use dom::element::{AttributeHandlers, Element}; +use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; @@ -36,6 +35,8 @@ impl HTMLSelectElementDerived for EventTarget { } } +static DEFAULT_SELECT_SIZE: u32 = 0; + impl HTMLSelectElement { fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLSelectElement { HTMLSelectElement { @@ -66,10 +67,27 @@ impl<'a> HTMLSelectElementMethods for JSRef<'a, HTMLSelectElement> { // https://www.whatwg.org/html/#dom-fe-disabled make_bool_setter!(SetDisabled, "disabled"); + // https://html.spec.whatwg.org/multipage/#dom-select-multiple + make_bool_getter!(Multiple); + + // https://html.spec.whatwg.org/multipage/#dom-select-multiple + make_bool_setter!(SetMultiple, "multiple"); + + // https://html.spec.whatwg.org/multipage/#dom-fe-name + make_getter!(Name); + + // https://html.spec.whatwg.org/multipage/#dom-fe-name + make_setter!(SetName, "name"); + + // https://html.spec.whatwg.org/multipage/#dom-select-size + make_uint_getter!(Size, "size", DEFAULT_SELECT_SIZE); + + // https://html.spec.whatwg.org/multipage/#dom-select-size + make_uint_setter!(SetSize, "size", DEFAULT_SELECT_SIZE); + // https://html.spec.whatwg.org/multipage/#dom-select-type fn Type(self) -> DOMString { - let elem: JSRef<Element> = ElementCast::from_ref(self); - if elem.has_attribute(&atom!("multiple")) { + if self.Multiple() { "select-multiple".to_owned() } else { "select-one".to_owned() @@ -135,5 +153,12 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { node.check_disabled_attribute(); } } + + fn parse_plain_attribute(&self, local_name: &Atom, value: DOMString) -> AttrValue { + match local_name { + &atom!("size") => AttrValue::from_u32(value, DEFAULT_SELECT_SIZE), + _ => self.super_type().unwrap().parse_plain_attribute(local_name, value), + } + } } diff --git a/components/script/dom/webidls/HTMLSelectElement.webidl b/components/script/dom/webidls/HTMLSelectElement.webidl index c246eddb850..09f36334e7b 100644 --- a/components/script/dom/webidls/HTMLSelectElement.webidl +++ b/components/script/dom/webidls/HTMLSelectElement.webidl @@ -8,10 +8,10 @@ interface HTMLSelectElement : HTMLElement { // attribute boolean autofocus; attribute boolean disabled; //readonly attribute HTMLFormElement? form; - // attribute boolean multiple; - // attribute DOMString name; + attribute boolean multiple; + attribute DOMString name; // attribute boolean required; - // attribute unsigned long size; + attribute unsigned long size; readonly attribute DOMString type; |