aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-07-03 17:34:08 +0200
committerMs2ger <ms2ger@gmail.com>2015-07-07 13:14:59 +0200
commit52e336e5a8c9574dcb91aed8e8c2696300520d04 (patch)
tree60733ceb2cb8df4611a70f9a2d51c1fdc2dd5995
parent73b52c095a448116c0f9db23894a0932d0d53484 (diff)
downloadservo-52e336e5a8c9574dcb91aed8e8c2696300520d04.tar.gz
servo-52e336e5a8c9574dcb91aed8e8c2696300520d04.zip
Only make a elements activatable when they have an href attribute.
I've tested this manually, by clicking on the "baz" in code like ```js var a = document.body.appendChild(document.createElement("a")); a.textContent = "bar "; a.setAttribute("href", "http://www.yahoo.com"); var b = a.appendChild(document.createElement("a")); b.textContent = "baz"; ``` Before this change, the click is trapped by `b` and ignored there; after this change, the click passes through `b` to `a`, where it is handled. Unfortunately, I haven't found a way to write an automated test.
-rw-r--r--components/script/dom/htmlanchorelement.rs20
1 files changed, 12 insertions, 8 deletions
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
index 9f1f57a0baf..afe10ed7157 100644
--- a/components/script/dom/htmlanchorelement.rs
+++ b/components/script/dom/htmlanchorelement.rs
@@ -101,7 +101,12 @@ impl<'a> Activatable for &'a HTMLAnchorElement {
}
fn is_instance_activatable(&self) -> bool {
- true
+ // https://html.spec.whatwg.org/multipage/#hyperlink
+ // "a [...] element[s] with an href attribute [...] must [..] create a
+ // hyperlink"
+ // https://html.spec.whatwg.org/multipage/#the-a-element
+ // "The activation behaviour of a elements *that create hyperlinks*"
+ ElementCast::from_ref(*self).has_attribute(&atom!("href"))
}
@@ -141,14 +146,13 @@ impl<'a> Activatable for &'a HTMLAnchorElement {
//TODO: Step 4. Download the link is `download` attribute is set.
- if let Some(ref href) = element.get_attribute(&ns!(""), &atom!("href")) {
- let mut value = href.r().Value();
- if let Some(suffix) = ismap_suffix {
- value.push_str(&suffix);
- }
- debug!("clicked on link to {}", value);
- doc.r().load_anchor_href(value);
+ let href = element.get_attribute(&ns!(""), &atom!("href")).unwrap();
+ let mut value = href.r().Value();
+ if let Some(suffix) = ismap_suffix {
+ value.push_str(&suffix);
}
+ debug!("clicked on link to {}", value);
+ doc.r().load_anchor_href(value);
}
//TODO:https://html.spec.whatwg.org/multipage/#the-a-element