diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/htmlcollection.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmlformelement.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmltableelement.rs | 10 | ||||
| -rw-r--r-- | components/script/dom/htmltablerowelement.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmltablesectionelement.rs | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index a7bf82ae50e..b1f1771dd07 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -161,8 +161,8 @@ impl HTMLCollection { } impl CollectionFilter for TagNameNSFilter { fn filter(&self, elem: &Element, _root: &Node) -> bool { - ((self.qname.ns == Namespace(atom!("*"))) || (self.qname.ns == *elem.namespace())) - && ((self.qname.local == atom!("*")) || (self.qname.local == *elem.local_name())) + ((self.qname.ns == Namespace(atom!("*"))) || (self.qname.ns == *elem.namespace())) && + ((self.qname.local == atom!("*")) || (self.qname.local == *elem.local_name())) } } let filter = TagNameNSFilter { diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 3e7421de443..a844cc3c1cb 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -244,8 +244,8 @@ impl HTMLFormElement { let base = doc.url(); // TODO: Handle browsing contexts // Step 4 - if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod - && !submitter.no_validate(self) + if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod && + !submitter.no_validate(self) { if self.interactive_validation().is_err() { // TODO: Implement event handlers on all form control elements diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 4b5cd44773d..5ad77e9e8b4 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -132,8 +132,8 @@ impl HTMLTableElementMethods for HTMLTableElement { impl CollectionFilter for TableRowFilter { fn filter(&self, elem: &Element, root: &Node) -> bool { - elem.is::<HTMLTableRowElement>() - && (root.is_parent_of(elem.upcast()) + elem.is::<HTMLTableRowElement>() && + (root.is_parent_of(elem.upcast()) || self.sections.iter().any(|ref section| section.is_parent_of(elem.upcast()))) } } @@ -250,9 +250,9 @@ impl HTMLTableElementMethods for HTMLTableElement { struct TBodiesFilter; impl CollectionFilter for TBodiesFilter { fn filter(&self, elem: &Element, root: &Node) -> bool { - elem.is::<HTMLTableSectionElement>() - && elem.local_name() == &atom!("tbody") - && elem.upcast::<Node>().GetParentNode().r() == Some(root) + elem.is::<HTMLTableSectionElement>() && + elem.local_name() == &atom!("tbody") && + elem.upcast::<Node>().GetParentNode().r() == Some(root) } } diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index bb83e00b0db..2969102984d 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/components/script/dom/htmltablerowelement.rs @@ -29,8 +29,8 @@ use util::str::DOMString; struct CellsFilter; impl CollectionFilter for CellsFilter { fn filter(&self, elem: &Element, root: &Node) -> bool { - (elem.is::<HTMLTableHeaderCellElement>() || elem.is::<HTMLTableDataCellElement>()) - && elem.upcast::<Node>().GetParentNode().r() == Some(root) + (elem.is::<HTMLTableHeaderCellElement>() || elem.is::<HTMLTableDataCellElement>()) && + elem.upcast::<Node>().GetParentNode().r() == Some(root) } } diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index e51caa9f30e..fc737aed9ea 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/components/script/dom/htmltablesectionelement.rs @@ -44,8 +44,8 @@ impl HTMLTableSectionElement { struct RowsFilter; impl CollectionFilter for RowsFilter { fn filter(&self, elem: &Element, root: &Node) -> bool { - elem.is::<HTMLTableRowElement>() - && elem.upcast::<Node>().GetParentNode().r() == Some(root) + elem.is::<HTMLTableRowElement>() && + elem.upcast::<Node>().GetParentNode().r() == Some(root) } } |