diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-30 18:18:49 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-30 18:18:49 -0700 |
| commit | 1d7b1e5c3199bc08e238641e20480752a06f19ea (patch) | |
| tree | 1af3636d87eeb0a6c6c6ef5018e9d6aef6e880e7 /components/script/dom/element.rs | |
| parent | 66384dfcfd4c38595985cd3fac12fa616a2ba94f (diff) | |
| parent | 2f9eee451dcb98e10cfae5ed2712cd2a65695963 (diff) | |
| download | servo-1d7b1e5c3199bc08e238641e20480752a06f19ea.tar.gz servo-1d7b1e5c3199bc08e238641e20480752a06f19ea.zip | |
auto merge of #4779 : Manishearth/servo/more-activation, r=jdm
Diffstat (limited to 'components/script/dom/element.rs')
| -rw-r--r-- | components/script/dom/element.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 84f3d88ac7d..9b74c0cb5c9 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1449,7 +1449,11 @@ impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) => { let element: &'a JSRef<'a, HTMLInputElement> = HTMLInputElementCast::to_borrowed_ref(self).unwrap(); - Some(element as &'a (Activatable + 'a)) + if element.is_instance_activatable() { + Some(element as &'a (Activatable + 'a)) + } else { + None + } }, _ => { None |