mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
implement Document#createAttribute
This commit is contained in:
parent
b4c3aec383
commit
4b754bd457
8 changed files with 43 additions and 66 deletions
|
@ -82,7 +82,7 @@ pub struct Attr {
|
|||
prefix: Option<DOMString>,
|
||||
|
||||
/// the element that owns this attribute.
|
||||
owner: JS<Element>,
|
||||
owner: Option<JS<Element>>,
|
||||
}
|
||||
|
||||
impl Reflectable for Attr {
|
||||
|
@ -94,7 +94,7 @@ impl Reflectable for Attr {
|
|||
impl Attr {
|
||||
fn new_inherited(local_name: Atom, value: AttrValue,
|
||||
name: Atom, namespace: Namespace,
|
||||
prefix: Option<DOMString>, owner: JSRef<Element>) -> Attr {
|
||||
prefix: Option<DOMString>, owner: Option<JSRef<Element>>) -> Attr {
|
||||
Attr {
|
||||
reflector_: Reflector::new(),
|
||||
local_name: local_name,
|
||||
|
@ -102,13 +102,13 @@ impl Attr {
|
|||
name: name,
|
||||
namespace: namespace,
|
||||
prefix: prefix,
|
||||
owner: JS::from_rooted(owner),
|
||||
owner: owner.map(|o| JS::from_rooted(o)),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(window: JSRef<Window>, local_name: Atom, value: AttrValue,
|
||||
name: Atom, namespace: Namespace,
|
||||
prefix: Option<DOMString>, owner: JSRef<Element>) -> Temporary<Attr> {
|
||||
prefix: Option<DOMString>, owner: Option<JSRef<Element>>) -> Temporary<Attr> {
|
||||
reflect_dom_object(box Attr::new_inherited(local_name, value, name, namespace, prefix, owner),
|
||||
&global::Window(window), AttrBinding::Wrap)
|
||||
}
|
||||
|
@ -139,9 +139,16 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
|
|||
}
|
||||
|
||||
fn SetValue(self, value: DOMString) {
|
||||
let owner = self.owner.root();
|
||||
let value = owner.parse_attribute(&self.namespace, self.local_name(), value);
|
||||
self.set_value(ReplacedAttr, value);
|
||||
match self.owner {
|
||||
None => {
|
||||
*self.value.borrow_mut() = StringAttrValue(value)
|
||||
}
|
||||
Some(o) => {
|
||||
let owner = o.root();
|
||||
let value = owner.parse_attribute(&self.namespace, self.local_name(), value);
|
||||
self.set_value(ReplacedAttr, value, *owner);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn TextContent(self) -> DOMString {
|
||||
|
@ -177,7 +184,7 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
|
|||
}
|
||||
|
||||
fn GetOwnerElement(self) -> Option<Temporary<Element>> {
|
||||
Some(Temporary::new(self.owner))
|
||||
self.owner.map(|o| Temporary::new(o))
|
||||
}
|
||||
|
||||
fn Specified(self) -> bool {
|
||||
|
@ -186,16 +193,17 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
|
|||
}
|
||||
|
||||
pub trait AttrHelpers<'a> {
|
||||
fn set_value(self, set_type: AttrSettingType, value: AttrValue);
|
||||
fn set_value(self, set_type: AttrSettingType, value: AttrValue, owner: JSRef<Element>);
|
||||
fn value(self) -> Ref<'a, AttrValue>;
|
||||
fn local_name(self) -> &'a Atom;
|
||||
fn summarize(self) -> AttrInfo;
|
||||
}
|
||||
|
||||
impl<'a> AttrHelpers<'a> for JSRef<'a, Attr> {
|
||||
fn set_value(self, set_type: AttrSettingType, value: AttrValue) {
|
||||
let owner = self.owner.root();
|
||||
let node: JSRef<Node> = NodeCast::from_ref(*owner);
|
||||
fn set_value(self, set_type: AttrSettingType, value: AttrValue, owner: JSRef<Element>) {
|
||||
assert!(Some(owner) == self.owner.map(|o| *o.root()));
|
||||
|
||||
let node: JSRef<Node> = NodeCast::from_ref(owner);
|
||||
let namespace_is_null = self.namespace == ns!("");
|
||||
|
||||
match set_type {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* 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::AttrHelpers;
|
||||
use dom::attr::{Attr, AttrHelpers, StringAttrValue};
|
||||
use dom::bindings::cell::DOMRefCell;
|
||||
use dom::bindings::codegen::Bindings::DocumentBinding;
|
||||
use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState};
|
||||
|
@ -622,6 +622,22 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
|
|||
ScriptCreated))
|
||||
}
|
||||
|
||||
// http://dom.spec.whatwg.org/#dom-document-createattribute
|
||||
fn CreateAttribute(self, local_name: DOMString) -> Fallible<Temporary<Attr>> {
|
||||
if xml_name_type(local_name.as_slice()) == InvalidXMLName {
|
||||
debug!("Not a valid element name");
|
||||
return Err(InvalidCharacter);
|
||||
}
|
||||
|
||||
let window = self.window.root();
|
||||
let name = Atom::from_slice(local_name.as_slice());
|
||||
// repetition used because string_cache::atom::Atom is non-copyable
|
||||
let l_name = Atom::from_slice(local_name.as_slice());
|
||||
let value = StringAttrValue("".to_string());
|
||||
|
||||
Ok(Attr::new(*window, name, value, l_name, ns!(""), None, None))
|
||||
}
|
||||
|
||||
// http://dom.spec.whatwg.org/#dom-document-createdocumentfragment
|
||||
fn CreateDocumentFragment(self) -> Temporary<DocumentFragment> {
|
||||
DocumentFragment::new(self)
|
||||
|
|
|
@ -509,13 +509,13 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
|
|||
None => {
|
||||
let window = window_from_node(self).root();
|
||||
let attr = Attr::new(*window, local_name, value.clone(),
|
||||
name, namespace.clone(), prefix, self);
|
||||
name, namespace.clone(), prefix, Some(self));
|
||||
self.attrs.borrow_mut().push_unrooted(&attr);
|
||||
(self.attrs.borrow().len() - 1, FirstSetAttr)
|
||||
}
|
||||
};
|
||||
|
||||
(*self.attrs.borrow())[idx].root().set_value(set_type, value);
|
||||
(*self.attrs.borrow())[idx].root().set_value(set_type, value, self);
|
||||
}
|
||||
|
||||
fn parse_attribute(self, namespace: &Namespace, local_name: &Atom,
|
||||
|
|
|
@ -1558,7 +1558,7 @@ impl Node {
|
|||
&Attr::new(*window,
|
||||
attr.local_name().clone(), attr.value().clone(),
|
||||
attr.name().clone(), attr.namespace().clone(),
|
||||
attr.prefix().clone(), copy_elem));
|
||||
attr.prefix().clone(), Some(copy_elem)));
|
||||
}
|
||||
},
|
||||
_ => ()
|
||||
|
|
|
@ -35,6 +35,9 @@ interface Document : Node {
|
|||
[Throws]
|
||||
ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
|
||||
|
||||
[Throws]
|
||||
Attr createAttribute(DOMString localName);
|
||||
|
||||
[Throws]
|
||||
Node importNode(Node node, optional boolean deep = false);
|
||||
[Throws]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue