From 038a195eade5476601a183f4b74e669f8619d6a4 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 14 Mar 2014 12:00:42 +0100 Subject: Move attributes-related functions onto JS. --- src/components/script/script_task.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/components/script/script_task.rs') diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index bdb97ce6c9b..bbac828cf59 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -10,7 +10,7 @@ use dom::bindings::codegen::InheritTypes::{EventTargetCast, NodeCast, ElementCas use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, GlobalStaticData, with_gc_enabled}; use dom::document::{Document, HTMLDocument}; -use dom::element::Element; +use dom::element::{Element, AttributeHandlers}; use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseMoveEvent, MouseUpEvent}; use dom::event::Event; use dom::uievent::UIEvent; @@ -916,7 +916,7 @@ impl ScriptTask { let mut anchors = doc_node.traverse_preorder().filter(|node| node.is_anchor_element()); anchors.find(|node| { let elem: JS = ElementCast::to(node).unwrap(); - elem.get().get_attribute(Null, "name").map_or(false, |attr| { + elem.get_attribute(Null, "name").map_or(false, |attr| { attr.get().value_ref() == fragid }) }).map(|node| ElementCast::to(&node).unwrap()) @@ -1029,7 +1029,7 @@ impl ScriptTask { if node.is_element() { let element: JS = ElementCast::to(&node).unwrap(); if "a" == element.get().tag_name { - self.load_url_from_element(page, element.get()) + self.load_url_from_element(page, &element) } } }, @@ -1113,7 +1113,7 @@ impl ScriptTask { } } - fn load_url_from_element(&self, page: &Page, element: &Element) { + fn load_url_from_element(&self, page: &Page, element: &JS) { // if the node's element is "a," load url from href attr let attr = element.get_attribute(Null, "href"); for href in attr.iter() { -- cgit v1.2.3