diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 42e3891a9fd..009378b00f2 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -86,7 +86,7 @@ use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks}; use ipc_channel::ipc; use layout_interface::{LayoutChan, Msg}; use string_cache::{Atom, QualName}; -use url::{Url, UrlParser}; +use url::Url; use js::jsapi::{JSContext, JSObject, JSRuntime}; use num::ToPrimitive; @@ -242,7 +242,6 @@ 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 load_anchor_href(self, href: DOMString); fn find_fragment_node(self, fragid: DOMString) -> Option>; fn hit_test(self, point: &Point2D) -> Option; fn get_nodes_under_mouse(self, point: &Point2D) -> Vec; @@ -464,15 +463,6 @@ impl<'a> DocumentHelpers<'a> for &'a Document { } } - fn load_anchor_href(self, href: DOMString) { - let window = self.window.root(); - let base_url = window.get_url(); - let url = UrlParser::new().base_url(&base_url).parse(&href); - // FIXME: handle URL parse errors more gracefully. - let url = url.unwrap(); - window.load_url(url); - } - /// 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> { diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index bace18798ed..2774b74a60a 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -29,6 +29,8 @@ use std::default::Default; use string_cache::Atom; use util::str::DOMString; +use url::UrlParser; + #[dom_struct] pub struct HTMLAnchorElement { htmlelement: HTMLElement, @@ -155,7 +157,13 @@ impl<'a> Activatable for &'a HTMLAnchorElement { value.push_str(&suffix); } debug!("clicked on link to {}", value); - doc.r().load_anchor_href(value); + + let window = doc.window(); + let base_url = window.get_url(); + let url = UrlParser::new().base_url(&base_url).parse(&value); + // FIXME: handle URL parse errors more gracefully. + let url = url.unwrap(); + window.load_url(url); } //TODO:https://html.spec.whatwg.org/multipage/#the-a-element