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

Auto merge of #11934 - jdm:navigatefragment, r=emilio

Browse source 
Special-case setting location.hash to the empty string

This avoids endless redirect loops on facebook and makes us compliant with https://github.com/whatwg/html/pull/1318.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #10952
- [X] There are tests for these changes OR

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11934)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-29 17:39:58 -05:00 • committed by GitHub
commit e30b288ed6
4 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/location.rs
View file

@ -66,7 +66,10 @@ impl LocationMethods for Location {
} }
// https://html.spec.whatwg.org/multipage/#dom-location-hash // https://html.spec.whatwg.org/multipage/#dom-location-hash
fn SetHash(&self, value: USVString) { fn SetHash(&self, mut value: USVString) {
if value.0.is_empty() {
value = USVString("#".to_owned());
}
self.set_url_component(value, UrlHelper::SetHash); self.set_url_component(value, UrlHelper::SetHash);
} }

11
tests/wpt/metadata/MANIFEST.json
View file

@ -36263,7 +36263,16 @@
"local_changes": { "local_changes": {
"deleted": [], "deleted": [],
"deleted_reftests": {}, "deleted_reftests": {},
"items": {}, "items": {
"testharness": {
"html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html": [
{
"path": "html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html",
"url": "/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html"
}
]
}
},
"reftest_nodes": {} "reftest_nodes": {}
}, },
"reftest_nodes": { "reftest_nodes": {

20
tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html Normal file
View file

@ -0,0 +1,20 @@
<!doctype html>
<meta charset="utf-8">
<title>Navigating to the same URL with an empty fragment aborts the navigation</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<iframe src="empty_fragment_iframe.html"></iframe>
<script>
// If the navigation were not aborted, we would expect multiple load events
// as the page continually reloads itself.
async_test(function(t) {
var count = 0;
var iframe = document.querySelector('iframe');
iframe.onload = t.step_func(function() {
count++;
});
window.child_succeeded = t.step_func_done(function() {
assert_equals(count, 1);
});
});
</script>

11
tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html Normal file
View file

@ -0,0 +1,11 @@
<script>
var timeout;
onload = function() {
location.hash = "";
timeout = setTimeout(function() { parent.child_succeeded() }, 2000);
};
onbeforeunload = function() {
clearTimeout(timeout);
}
</script>