diff --git a/src/components/script/dom/htmlbuttonelement.rs b/src/components/script/dom/htmlbuttonelement.rs index f57b8fdbdfd..0c8903603e1 100644 --- a/src/components/script/dom/htmlbuttonelement.rs +++ b/src/components/script/dom/htmlbuttonelement.rs @@ -50,10 +50,7 @@ impl<'a> HTMLButtonElementMethods for JSRef<'a, HTMLButtonElement> { } // http://www.whatwg.org/html/#dom-fe-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 6d5bc5a5aec..3bb30fbf7a7 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -69,10 +69,7 @@ impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> { } // http://www.whatwg.org/html/#dom-fieldset-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fieldset-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index 32997a507f1..38d63acc7da 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -44,10 +44,7 @@ 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") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs index eee7c80f27b..6e90cb45fe5 100644 --- a/src/components/script/dom/htmloptgroupelement.rs +++ b/src/components/script/dom/htmloptgroupelement.rs @@ -44,10 +44,7 @@ impl HTMLOptGroupElement { impl<'a> HTMLOptGroupElementMethods for JSRef<'a, HTMLOptGroupElement> { // http://www.whatwg.org/html#dom-optgroup-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html#dom-optgroup-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmloptionelement.rs b/src/components/script/dom/htmloptionelement.rs index ac0502eb0eb..d066784b285 100644 --- a/src/components/script/dom/htmloptionelement.rs +++ b/src/components/script/dom/htmloptionelement.rs @@ -44,10 +44,7 @@ impl HTMLOptionElement { impl<'a> HTMLOptionElementMethods for JSRef<'a, HTMLOptionElement> { // http://www.whatwg.org/html/#dom-option-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-option-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmlselectelement.rs b/src/components/script/dom/htmlselectelement.rs index 93717fc9265..b8b5303cffb 100644 --- a/src/components/script/dom/htmlselectelement.rs +++ b/src/components/script/dom/htmlselectelement.rs @@ -56,10 +56,7 @@ impl<'a> HTMLSelectElementMethods for JSRef<'a, HTMLSelectElement> { } // http://www.whatwg.org/html/#dom-fe-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled fn SetDisabled(&self, disabled: bool) { diff --git a/src/components/script/dom/htmltextareaelement.rs b/src/components/script/dom/htmltextareaelement.rs index 7e607f131dd..5385fefab7e 100644 --- a/src/components/script/dom/htmltextareaelement.rs +++ b/src/components/script/dom/htmltextareaelement.rs @@ -44,10 +44,7 @@ impl HTMLTextAreaElement { impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> { // http://www.whatwg.org/html/#dom-fe-disabled - fn Disabled(&self) -> bool { - let elem: &JSRef = ElementCast::from_ref(self); - elem.has_attribute("disabled") - } + make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled fn SetDisabled(&self, disabled: bool) {