diff options
author | Josh Matthews <josh@joshmatthews.net> | 2015-01-15 13:26:44 -0500 |
---|---|---|
committer | Glenn Watson <gw@intuitionlibrary.com> | 2015-01-28 10:16:49 +1000 |
commit | 95fc29fa0db21959df99d81cdbb9561226321d2f (patch) | |
tree | a48e171165ec155062ef13c550b2c0f72d127425 /components/script/dom/htmlelement.rs | |
parent | ff8cbff81016c157373c1675f3eee69dd70ae544 (diff) | |
download | servo-95fc29fa0db21959df99d81cdbb9561226321d2f.tar.gz servo-95fc29fa0db21959df99d81cdbb9561226321d2f.zip |
Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.
Diffstat (limited to 'components/script/dom/htmlelement.rs')
-rw-r--r-- | components/script/dom/htmlelement.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index d5fae8353be..633b8f5f297 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -21,6 +21,7 @@ use dom::document::Document; use dom::domstringmap::DOMStringMap; use dom::element::{Element, ElementTypeId, ActivationElementHelpers, AttributeHandlers}; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; +use dom::htmlinputelement::HTMLInputElement; use dom::htmlmediaelement::HTMLMediaElementTypeId; use dom::htmltablecellelement::HTMLTableCellElementTypeId; use dom::node::{Node, NodeTypeId, window_from_node}; @@ -84,17 +85,17 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { }) } - make_getter!(Title) - make_setter!(SetTitle, "title") + make_getter!(Title); + make_setter!(SetTitle, "title"); - make_getter!(Lang) - make_setter!(SetLang, "lang") + make_getter!(Lang); + make_setter!(SetLang, "lang"); // http://html.spec.whatwg.org/multipage/#dom-hidden - make_bool_getter!(Hidden) - make_bool_setter!(SetHidden, "hidden") + make_bool_getter!(Hidden); + make_bool_setter!(SetHidden, "hidden"); - global_event_handlers!(NoOnload) + global_event_handlers!(NoOnload); // https://html.spec.whatwg.org/multipage/dom.html#dom-dataset fn Dataset(self) -> Temporary<DOMStringMap> { @@ -123,7 +124,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { // https://html.spec.whatwg.org/multipage/interaction.html#dom-click fn Click(self) { - let maybe_input = HTMLInputElementCast::to_ref(self); + let maybe_input: Option<JSRef<HTMLInputElement>> = HTMLInputElementCast::to_ref(self); match maybe_input { Some(i) if i.Disabled() => return, _ => () @@ -205,7 +206,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLElement> { } } -#[deriving(Copy, PartialEq, Show)] +#[derive(Copy, PartialEq, Show)] #[jstraceable] pub enum HTMLElementTypeId { HTMLElement, |