mirror of
https://github.com/servo/servo.git
synced 2025-06-25 01:24:37 +01:00
Implement Element.attributes.
This commit is contained in:
parent
6a0201a5a6
commit
249cc6e38f
6 changed files with 102 additions and 7 deletions
66
src/components/script/dom/attrlist.rs
Normal file
66
src/components/script/dom/attrlist.rs
Normal file
|
@ -0,0 +1,66 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::attr::Attr;
|
||||
use dom::bindings::codegen::AttrListBinding;
|
||||
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
|
||||
use dom::node::{AbstractNode, ScriptView};
|
||||
use dom::window::Window;
|
||||
|
||||
pub struct AttrList {
|
||||
reflector_: Reflector,
|
||||
window: @mut Window,
|
||||
owner: AbstractNode<ScriptView>
|
||||
}
|
||||
|
||||
impl AttrList {
|
||||
pub fn new_inherited(window: @mut Window,
|
||||
elem: AbstractNode<ScriptView>) -> AttrList {
|
||||
AttrList {
|
||||
reflector_: Reflector::new(),
|
||||
window: window,
|
||||
owner: elem
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(window: @mut Window, elem: AbstractNode<ScriptView>) -> @mut AttrList {
|
||||
reflect_dom_object(@mut AttrList::new_inherited(window, elem),
|
||||
window, AttrListBinding::Wrap)
|
||||
}
|
||||
|
||||
pub fn Length(&self) -> u32 {
|
||||
self.owner.with_imm_element(|elem| elem.attrs_insert_order.len() as u32)
|
||||
}
|
||||
|
||||
pub fn Item(&self, index: u32) -> Option<@mut Attr> {
|
||||
if index >= self.Length() {
|
||||
None
|
||||
} else {
|
||||
do self.owner.with_imm_element |elem| {
|
||||
let insert_order = &elem.attrs_insert_order[index];
|
||||
do elem.attrs.find_equiv(&insert_order.first()).and_then |attrs| {
|
||||
attrs.iter()
|
||||
.find(|attr| attr.namespace == insert_order.second())
|
||||
.map(|attr| *attr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<@mut Attr> {
|
||||
let item = self.Item(index);
|
||||
*found = item.is_some();
|
||||
item
|
||||
}
|
||||
}
|
||||
|
||||
impl Reflectable for AttrList {
|
||||
fn reflector<'a>(&'a self) -> &'a Reflector {
|
||||
&self.reflector_
|
||||
}
|
||||
|
||||
fn mut_reflector<'a>(&'a mut self) -> &'a mut Reflector {
|
||||
&mut self.reflector_
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
interface AttrList {
|
||||
readonly attribute unsigned long length;
|
||||
getter Attr? item(unsigned long index);
|
||||
};
|
|
@ -72,6 +72,9 @@ DOMInterfaces = {
|
|||
'AudioBuffer' : {
|
||||
},
|
||||
|
||||
'AttrList': {
|
||||
},
|
||||
|
||||
'mozAudioContext': {
|
||||
'nativeType': 'AudioContext',
|
||||
'implicitJSContext': [ 'createBuffer' ],
|
||||
|
@ -181,7 +184,7 @@ DOMInterfaces = {
|
|||
'Element': {
|
||||
'nativeType': 'AbstractNode<ScriptView>',
|
||||
'pointerType': '',
|
||||
'needsAbstract': ['getClientRects', 'getBoundingClientRect', 'setAttribute', 'setAttributeNS', 'id']
|
||||
'needsAbstract': ['getClientRects', 'getBoundingClientRect', 'setAttribute', 'setAttributeNS', 'id', 'attributes']
|
||||
},
|
||||
|
||||
'Event': {
|
||||
|
|
|
@ -35,8 +35,8 @@ interface Element : Node {
|
|||
/*[Constant]
|
||||
readonly attribute DOMTokenList? classList;*/
|
||||
|
||||
/*[Constant]
|
||||
readonly attribute MozNamedAttrMap attributes;*/
|
||||
[Constant]
|
||||
readonly attribute AttrList attributes;
|
||||
DOMString? getAttribute(DOMString name);
|
||||
DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
|
||||
[Throws]
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
//! Element nodes.
|
||||
|
||||
use dom::attrlist::AttrList;
|
||||
use dom::bindings::utils::{Reflectable, DOMString, ErrorResult, Fallible, Reflector};
|
||||
use dom::bindings::utils::{null_str_as_empty, null_str_as_empty_ref, NamespaceError};
|
||||
use dom::bindings::utils::{InvalidCharacter, QName, Name, InvalidXMLName, xml_name_type};
|
||||
|
@ -30,8 +31,9 @@ pub struct Element {
|
|||
node: Node<ScriptView>,
|
||||
tag_name: ~str, // TODO: This should be an atom, not a ~str.
|
||||
attrs: HashMap<~str, ~[@mut Attr]>,
|
||||
attrs_list: ~[~str], // store an order of attributes.
|
||||
attrs_insert_order: ~[(~str, Namespace)], // store an order of attributes.
|
||||
style_attribute: Option<style::PropertyDeclarationBlock>,
|
||||
attr_list: Option<@mut AttrList>
|
||||
}
|
||||
|
||||
impl Reflectable for Element {
|
||||
|
@ -149,7 +151,8 @@ impl<'self> Element {
|
|||
node: Node::new(ElementNodeTypeId(type_id), document),
|
||||
tag_name: tag_name,
|
||||
attrs: HashMap::new(),
|
||||
attrs_list: ~[],
|
||||
attrs_insert_order: ~[],
|
||||
attr_list: None,
|
||||
style_attribute: None,
|
||||
}
|
||||
}
|
||||
|
@ -217,7 +220,8 @@ impl<'self> Element {
|
|||
self.attrs.mangle(local_name.clone(), new_attr,
|
||||
|new_name: &~str, new_value: @mut Attr| {
|
||||
// register to the ordered list.
|
||||
self.attrs_list.push(new_name.clone());
|
||||
let order_value = (new_name.clone(), new_value.namespace.clone());
|
||||
self.attrs_insert_order.push(order_value);
|
||||
~[new_value]
|
||||
},
|
||||
|name, old_value: &mut ~[@mut Attr], new_value: @mut Attr| {
|
||||
|
@ -234,7 +238,8 @@ impl<'self> Element {
|
|||
}
|
||||
if !found {
|
||||
old_value.push(new_value);
|
||||
self.attrs_list.push(name.clone());
|
||||
let order_value = (name.clone(), new_value.namespace.clone());
|
||||
self.attrs_insert_order.push(order_value);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -295,6 +300,18 @@ impl Element {
|
|||
self.set_attribute(abstract_self, namespace::Null, &Some(~"id"), &Some(id.clone()));
|
||||
}
|
||||
|
||||
pub fn Attributes(&mut self, abstract_self: AbstractNode<ScriptView>) -> @mut AttrList {
|
||||
match self.attr_list {
|
||||
None => {
|
||||
let window = self.node.owner_doc().document().window;
|
||||
let list = AttrList::new(window, abstract_self);
|
||||
self.attr_list = Some(list);
|
||||
list
|
||||
}
|
||||
Some(list) => list
|
||||
}
|
||||
}
|
||||
|
||||
pub fn GetAttribute(&self, name: &DOMString) -> Option<DOMString> {
|
||||
self.get_attr(*name).map(|s| s.to_owned())
|
||||
}
|
||||
|
|
|
@ -45,6 +45,7 @@ pub mod dom {
|
|||
}
|
||||
|
||||
pub mod attr;
|
||||
pub mod attrlist;
|
||||
pub mod blob;
|
||||
pub mod characterdata;
|
||||
pub mod clientrect;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue