mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
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 -->
This commit is contained in:
commit
70b9922eb0
4 changed files with 26 additions and 13 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue