Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3081 from Ms2ger/location-empty

Browse source 
Return the empty string as appropriate for location.{search,hash}; r=Manishearth
This commit is contained in:
Ms2ger 2014-08-14 10:50:12 +02:00
commit 984ec0e0c3
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/location.rs
View file

@ -43,6 +43,7 @@ impl<'a> LocationMethods for JSRef<'a, Location> {
fn Search(&self) -> DOMString {
match self.page.get_url().query {
None => "".to_string(),
Some(ref query) if query.as_slice() == "" => "".to_string(),
Some(ref query) => "?".to_string().append(query.as_slice())
}
}
@ -50,7 +51,8 @@ impl<'a> LocationMethods for JSRef<'a, Location> {
fn Hash(&self) -> DOMString {
match self.page.get_url().fragment {
None => "".to_string(),
Some(ref query) => "#".to_string().append(query.as_slice())
Some(ref hash) if hash.as_slice() == "" => "".to_string(),
Some(ref hash) => "#".to_string().append(hash.as_slice())
}
}
}