Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Follow-up to work done in #4304.
all_elements should ignore root as well.
  • Loading branch information
neojski committed Dec 12, 2014
1 parent 5913ba9 commit b30cdb8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
5 changes: 4 additions & 1 deletion components/script/dom/htmlcollection.rs
Expand Up @@ -62,7 +62,10 @@ impl HTMLCollection {
namespace_filter: Option<Namespace>
}
impl CollectionFilter for AllElementFilter {
fn filter(&self, elem: JSRef<Element>, _root: JSRef<Node>) -> bool {
fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool {
if NodeCast::from_ref(elem) == root {
return false
}
match self.namespace_filter {
None => true,
Some(ref namespace) => *elem.namespace() == *namespace
Expand Down
Expand Up @@ -5,7 +5,3 @@
[hasOwnProperty, getOwnPropertyDescriptor, getOwnPropertyNames]
expected: FAIL
[getElementsByTagName(\'*\')]
expected: FAIL

This file was deleted.

5 comments on commit b30cdb8

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from Ms2ger
at neojski@b30cdb8

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging neojski/servo/getElementsByTagNameNS-filter-root = b30cdb8 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

neojski/servo/getElementsByTagNameNS-filter-root = b30cdb8 merged ok, testing candidate = 9e83f09

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 9e83f09

Please sign in to comment.