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

auto merge of #2340 : glennw/servo/js-click-assert, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-05-07 00:46:21 -04:00
commit dc49e7d1a0
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/components/script/script_task.rs
View file

@ -1125,25 +1125,19 @@ impl ScriptTask {
match page.hit_test(&point) {
Some(node_address) => {
debug!("node address is {:?}", node_address);
let mut node =
node::from_untrusted_node_address(self.js_runtime.deref().ptr,
node_address).root();
debug!("clicked on {:s}", node.deref().debug_str());
// Traverse node generations until a node that is an element is
// found.
while !node.deref().is_element() {
match node.deref().parent_node() {
Some(parent) => node = parent.root(),
None => break,
}
}
let temp_node =
node::from_untrusted_node_address(
self.js_runtime.deref().ptr, node_address);
if node.deref().is_element() {
let element: &JSRef<Element> = ElementCast::to_ref(&*node).unwrap();
if "a" == element.deref().local_name {
self.load_url_from_element(page, element)
let maybe_node = temp_node.root().ancestors().find(|node| node.is_anchor_element());
match maybe_node {
Some(node) => {
debug!("clicked on {:s}", node.debug_str());
let element: &JSRef<Element> = ElementCast::to_ref(&node).unwrap();
self.load_url_from_element(page, element);
}
None => {}
}
}