From 4e37b3c8c7d9288161ff0aec0b35aad72d43275e Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 27 Jun 2014 16:18:33 -0400 Subject: [PATCH] Implement support for 'disabled' property in HTMLInputElement --- src/components/script/dom/htmlinputelement.rs | 87 ++++++++++++++++++- src/components/script/dom/virtualmethods.rs | 7 ++ .../dom/webidls/HTMLInputElement.webidl | 2 +- 3 files changed, 92 insertions(+), 4 deletions(-) diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index 1209fa11619..9701ef384be 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -3,14 +3,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::Bindings::HTMLInputElementBinding; -use dom::bindings::codegen::InheritTypes::HTMLInputElementDerived; +use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods; +use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCast}; +use dom::bindings::codegen::InheritTypes::{HTMLInputElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::Document; -use dom::element::HTMLInputElementTypeId; +use dom::element::{AttributeHandlers, Element, HTMLInputElementTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::htmlelement::HTMLElement; -use dom::node::{Node, ElementNodeTypeId}; +use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId}; +use dom::virtualmethods::VirtualMethods; use servo_util::str::DOMString; #[deriving(Encodable)] @@ -37,6 +40,84 @@ impl HTMLInputElement { } } +impl<'a> HTMLInputElementMethods for JSRef<'a, HTMLInputElement> { + // http://www.whatwg.org/html/#dom-fe-disabled + fn Disabled(&self) -> bool { + let elem: &JSRef = ElementCast::from_ref(self); + elem.has_attribute("disabled") + } + + // http://www.whatwg.org/html/#dom-fe-disabled + fn SetDisabled(&self, disabled: bool) { + let elem: &JSRef = ElementCast::from_ref(self); + elem.set_bool_attribute("disabled", disabled) + } +} + +impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { + fn super_type<'a>(&'a self) -> Option<&'a VirtualMethods> { + let htmlelement: &JSRef = HTMLElementCast::from_ref(self); + Some(htmlelement as &VirtualMethods) + } + + fn after_set_attr(&self, name: DOMString, value: DOMString) { + match self.super_type() { + Some(ref s) => s.after_set_attr(name.clone(), value.clone()), + _ => (), + } + + let node: &JSRef = NodeCast::from_ref(self); + match name.as_slice() { + "disabled" => { + node.set_disabled_state(true); + node.set_enabled_state(false); + }, + _ => () + } + } + + fn before_remove_attr(&self, name: DOMString, value: DOMString) { + match self.super_type() { + Some(ref s) => s.before_remove_attr(name.clone(), value), + _ => (), + } + + let node: &JSRef = NodeCast::from_ref(self); + match name.as_slice() { + "disabled" => { + node.set_disabled_state(false); + node.set_enabled_state(true); + node.check_ancestors_disabled_state_for_form_control(); + }, + _ => () + } + } + + fn bind_to_tree(&self, tree_in_doc: bool) { + match self.super_type() { + Some(ref s) => s.bind_to_tree(tree_in_doc), + _ => (), + } + + let node: &JSRef = NodeCast::from_ref(self); + node.check_ancestors_disabled_state_for_form_control(); + } + + fn unbind_from_tree(&self, tree_in_doc: bool) { + match self.super_type() { + Some(ref s) => s.unbind_from_tree(tree_in_doc), + _ => (), + } + + let node: &JSRef = NodeCast::from_ref(self); + if node.ancestors().any(|ancestor| ancestor.is_htmlfieldsetelement()) { + node.check_ancestors_disabled_state_for_form_control(); + } else { + node.check_disabled_attribute(); + } + } +} + impl Reflectable for HTMLInputElement { fn reflector<'a>(&'a self) -> &'a Reflector { self.htmlelement.reflector() diff --git a/src/components/script/dom/virtualmethods.rs b/src/components/script/dom/virtualmethods.rs index 75c77cf2148..80440f68af0 100644 --- a/src/components/script/dom/virtualmethods.rs +++ b/src/components/script/dom/virtualmethods.rs @@ -12,6 +12,7 @@ use dom::bindings::codegen::InheritTypes::HTMLElementCast; use dom::bindings::codegen::InheritTypes::HTMLFieldSetElementCast; use dom::bindings::codegen::InheritTypes::HTMLIFrameElementCast; use dom::bindings::codegen::InheritTypes::HTMLImageElementCast; +use dom::bindings::codegen::InheritTypes::HTMLInputElementCast; use dom::bindings::codegen::InheritTypes::HTMLObjectElementCast; use dom::bindings::codegen::InheritTypes::HTMLStyleElementCast; use dom::bindings::js::JSRef; @@ -24,6 +25,7 @@ use dom::element::HTMLCanvasElementTypeId; use dom::element::HTMLFieldSetElementTypeId; use dom::element::HTMLIFrameElementTypeId; use dom::element::HTMLImageElementTypeId; +use dom::element::HTMLInputElementTypeId; use dom::element::HTMLObjectElementTypeId; use dom::element::HTMLStyleElementTypeId; use dom::event::Event; @@ -35,6 +37,7 @@ use dom::htmlelement::HTMLElement; use dom::htmlfieldsetelement::HTMLFieldSetElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; +use dom::htmlinputelement::HTMLInputElement; use dom::htmlobjectelement::HTMLObjectElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::node::{Node, NodeHelpers, ElementNodeTypeId}; @@ -145,6 +148,10 @@ pub fn vtable_for<'a>(node: &'a JSRef) -> &'a VirtualMethods { let element: &JSRef = HTMLIFrameElementCast::to_ref(node).unwrap(); element as &VirtualMethods } + ElementNodeTypeId(HTMLInputElementTypeId) => { + let element: &JSRef = HTMLInputElementCast::to_ref(node).unwrap(); + element as &VirtualMethods + } ElementNodeTypeId(HTMLObjectElementTypeId) => { let element: &JSRef = HTMLObjectElementCast::to_ref(node).unwrap(); element as &VirtualMethods diff --git a/src/components/script/dom/webidls/HTMLInputElement.webidl b/src/components/script/dom/webidls/HTMLInputElement.webidl index 256cc814cff..1caa9137e0b 100644 --- a/src/components/script/dom/webidls/HTMLInputElement.webidl +++ b/src/components/script/dom/webidls/HTMLInputElement.webidl @@ -12,7 +12,7 @@ interface HTMLInputElement : HTMLElement { // attribute boolean defaultChecked; // attribute boolean checked; // attribute DOMString dirName; - // attribute boolean disabled; + attribute boolean disabled; //readonly attribute HTMLFormElement? form; //readonly attribute FileList? files; // attribute DOMString formAction;