diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-08-19 01:40:28 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-08-19 01:40:28 -0600 |
commit | 70b9922eb021a41ebdd9f54a4db0e9ddfb17786a (patch) | |
tree | d3e8a28e54cc3941a3126fcfd13f3be108dbc578 /components/script/dom | |
parent | 19d466b06250f10169e88fc7f0b447c7f2f8209e (diff) | |
parent | af31e8ed0f3f74908fb2c970e8b2f254ba0d70bd (diff) | |
download | servo-70b9922eb021a41ebdd9f54a4db0e9ddfb17786a.tar.gz servo-70b9922eb021a41ebdd9f54a4db0e9ddfb17786a.zip |
Auto merge of #7260 - notriddle:issue_7169, r=Ms2ger
Navigate to a new page even when there's a fragment.
Closes #7169
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7260)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/document.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c538893506b..bc1198afac3 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -256,7 +256,7 @@ pub trait DocumentHelpers<'a> { fn disarm_reflow_timeout(self); fn unregister_named_element(self, to_unregister: &Element, id: Atom); fn register_named_element(self, element: &Element, id: Atom); - fn find_fragment_node(self, fragid: DOMString) -> Option<Root<Element>>; + fn find_fragment_node(self, fragid: &str) -> Option<Root<Element>>; fn hit_test(self, point: &Point2D<f32>) -> Option<UntrustedNodeAddress>; fn get_nodes_under_mouse(self, point: &Point2D<f32>) -> Vec<UntrustedNodeAddress>; fn set_ready_state(self, state: DocumentReadyState); @@ -513,12 +513,12 @@ impl<'a> DocumentHelpers<'a> for &'a Document { /// Attempt to find a named element in this page's document. /// https://html.spec.whatwg.org/multipage/#the-indicated-part-of-the-document - fn find_fragment_node(self, fragid: DOMString) -> Option<Root<Element>> { - self.GetElementById(fragid.clone()).or_else(|| { + fn find_fragment_node(self, fragid: &str) -> Option<Root<Element>> { + self.GetElementById(fragid.to_owned()).or_else(|| { let check_anchor = |&node: &&HTMLAnchorElement| { let elem = ElementCast::from_ref(node); elem.get_attribute(&ns!(""), &atom!("name")).map_or(false, |attr| { - &**attr.r().value() == &*fragid + &**attr.r().value() == fragid }) }; let doc_node = NodeCast::from_ref(self); |