diff options
| -rw-r--r-- | src/components/script/dom/node.rs | 10 | ||||
| -rw-r--r-- | src/test/content/test_document_getElementById.html | 19 |
2 files changed, 21 insertions, 8 deletions
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index dcb360e0425..71b2b121136 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -404,10 +404,12 @@ impl NodeHelpers for JS<Node> { assert!(self.parent_node().is_some()); let document = document_from_node(self); - for node in self.traverse_preorder() { - if node.is_element() { - let element: JS<Element> = ElementCast::to(&node); - element.bind_to_tree_impl(); + if self.is_in_doc() { + for node in self.traverse_preorder() { + if node.is_element() { + let element: JS<Element> = ElementCast::to(&node); + element.bind_to_tree_impl(); + } } } diff --git a/src/test/content/test_document_getElementById.html b/src/test/content/test_document_getElementById.html index 92040c8f257..9d066137ef3 100644 --- a/src/test/content/test_document_getElementById.html +++ b/src/test/content/test_document_getElementById.html @@ -66,21 +66,32 @@ is(e2, null, "test3-2, the method should return null when the passed id is none in document."); } + // test 4 { // Ensure that the id attribute only affects elements present in a document let e = document.createElement('div'); e.id = "should-not-exist"; - is(document.getElementById("should-not-exist"), null); + is(document.getElementById("should-not-exist"), null, "test 4-0"); document.body.appendChild(e); - is(document.getElementById("should-not-exist"), e); + is(document.getElementById("should-not-exist"), e, "test 4-1"); } // TODO: - // test4: "in tree order, within the context object's tree" + // test5: "in tree order, within the context object's tree" // http://dom.spec.whatwg.org/#dom-document-getelementbyid. // TODO: - // test5: innerHTML + // test6: innerHTML + + // test 7 + { + // Test that we only cache elements by ID if they're in a document (see #1874). + let s = document.createElement("div"); + s.setAttribute("id", "x"); + document.createElement("div").appendChild(s); + is(document.getElementById("x"), null, "test 7-0"); + } + finish(); </script> </body> |