From 7696a6bd203a2200ca7a3360f8911ee1befdce14 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 23 Feb 2016 14:25:19 +0100 Subject: [PATCH] Fix HTMLCollection::NamedItem --- components/script/dom/htmlcollection.rs | 4 ++-- .../dom/nodes/Document-getElementsByTagName.html.ini | 3 --- tests/wpt/metadata/dom/nodes/Element-children.html.ini | 5 ----- .../metadata/dom/nodes/Element-getElementsByTagName.html.ini | 3 --- 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 tests/wpt/metadata/dom/nodes/Element-children.html.ini diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index ec71502bf42..0c429c29527 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -337,8 +337,8 @@ impl HTMLCollectionMethods for HTMLCollection { // Step 2. self.elements_iter().find(|elem| { - elem.get_string_attribute(&atom!("name")) == key || - elem.get_string_attribute(&atom!("id")) == key + elem.get_string_attribute(&atom!("id")) == key || + (elem.namespace() == &ns!(html) && elem.get_string_attribute(&atom!("name")) == key) }) } diff --git a/tests/wpt/metadata/dom/nodes/Document-getElementsByTagName.html.ini b/tests/wpt/metadata/dom/nodes/Document-getElementsByTagName.html.ini index e867ec0267f..849409e0fe6 100644 --- a/tests/wpt/metadata/dom/nodes/Document-getElementsByTagName.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-getElementsByTagName.html.ini @@ -3,6 +3,3 @@ [Shouldn't be able to set unsigned properties on a HTMLCollection (strict mode)] expected: FAIL - [hasOwnProperty, getOwnPropertyDescriptor, getOwnPropertyNames] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Element-children.html.ini b/tests/wpt/metadata/dom/nodes/Element-children.html.ini deleted file mode 100644 index 5cab09c0321..00000000000 --- a/tests/wpt/metadata/dom/nodes/Element-children.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Element-children.html] - type: testharness - [HTMLCollection edge cases 1] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName.html.ini b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName.html.ini index f07faeff5df..5cda7ac70ed 100644 --- a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName.html.ini +++ b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName.html.ini @@ -3,6 +3,3 @@ [Shouldn't be able to set unsigned properties on a HTMLCollection (strict mode)] expected: FAIL - [hasOwnProperty, getOwnPropertyDescriptor, getOwnPropertyNames] - expected: FAIL -