auto merge of #4866 : KiChjang/servo/trigger-fragment-string, r=jdm

Fixes #4863
This commit is contained in:
bors-servo 2015-02-12 10:18:45 -07:00
commit 29d24a5049
2 changed files with 12 additions and 9 deletions

View file

@ -385,10 +385,13 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
let url = UrlParser::new().base_url(&base_url).parse(href.as_slice());
// FIXME: handle URL parse errors more gracefully.
let url = url.unwrap();
if href.as_slice().starts_with("#") {
self.script_chan.send(ScriptMsg::TriggerFragment(self.page.id, url));
} else {
self.script_chan.send(ScriptMsg::TriggerLoad(self.page.id, LoadData::new(url)));
match url.fragment {
Some(fragment) => {
self.script_chan.send(ScriptMsg::TriggerFragment(self.page.id, fragment));
},
None => {
self.script_chan.send(ScriptMsg::TriggerLoad(self.page.id, LoadData::new(url)));
}
}
}