Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 16:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3496 from zwarich/disabled-state-helpers-jsref

Browse source 
Convert &JSRef -> JSRef in DisabledStateHelpers

Reviewed-by: jdm
This commit is contained in:
bors-servo 2014-09-26 20:24:33 -06:00
commit a35212410a
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/node.rs
View file

@ -2091,17 +2091,17 @@ impl<'a> style::TNode<JSRef<'a, Element>> for JSRef<'a, Node> {
} }
pub trait DisabledStateHelpers { pub trait DisabledStateHelpers {
fn check_ancestors_disabled_state_for_form_control(&self); fn check_ancestors_disabled_state_for_form_control(self);
fn check_parent_disabled_state_for_option(&self); fn check_parent_disabled_state_for_option(self);
fn check_disabled_attribute(&self); fn check_disabled_attribute(self);
} }
impl<'a> DisabledStateHelpers for JSRef<'a, Node> { impl<'a> DisabledStateHelpers for JSRef<'a, Node> {
fn check_ancestors_disabled_state_for_form_control(&self) { fn check_ancestors_disabled_state_for_form_control(self) {
if self.get_disabled_state() { return; } if self.get_disabled_state() { return; }
for ancestor in self.ancestors().filter(|ancestor| ancestor.is_htmlfieldsetelement()) { for ancestor in self.ancestors().filter(|ancestor| ancestor.is_htmlfieldsetelement()) {
if !ancestor.get_disabled_state() { continue; } if !ancestor.get_disabled_state() { continue; }
if ancestor.is_parent_of(*self) { if ancestor.is_parent_of(self) {
self.set_disabled_state(true); self.set_disabled_state(true);
self.set_enabled_state(false); self.set_enabled_state(false);
return; return;
@ -2119,7 +2119,7 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> {
} }
} }
fn check_parent_disabled_state_for_option(&self) { fn check_parent_disabled_state_for_option(self) {
if self.get_disabled_state() { return; } if self.get_disabled_state() { return; }
match self.parent_node().root() { match self.parent_node().root() {
Some(ref parent) if parent.is_htmloptgroupelement() && parent.get_disabled_state() => { Some(ref parent) if parent.is_htmloptgroupelement() && parent.get_disabled_state() => {
@ -2130,8 +2130,8 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> {
} }
} }
fn check_disabled_attribute(&self) { fn check_disabled_attribute(self) {
let elem: JSRef<'a, Element> = ElementCast::to_ref(*self).unwrap(); let elem: JSRef<'a, Element> = ElementCast::to_ref(self).unwrap();
let has_disabled_attrib = elem.has_attribute("disabled"); let has_disabled_attrib = elem.has_attribute("disabled");
self.set_disabled_state(has_disabled_attrib); self.set_disabled_state(has_disabled_attrib);
self.set_enabled_state(!has_disabled_attrib); self.set_enabled_state(!has_disabled_attrib);