diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/script/dom/attr.rs | 19 | ||||
| -rw-r--r-- | src/components/script/dom/element.rs | 138 | ||||
| -rw-r--r-- | src/components/script/dom/node.rs | 14 | ||||
| -rw-r--r-- | src/components/script/dom/webidls/Element.webidl | 3 | ||||
| -rw-r--r-- | src/components/script/dom/webidls/Node.webidl | 4 | ||||
| -rw-r--r-- | src/test/content/test_element_attribute.html | 19 |
6 files changed, 141 insertions, 56 deletions
diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index 8357665b63d..40da74cfbd2 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::AttrBinding; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::window::Window; -use servo_util::namespace::{Namespace, Null}; +use servo_util::namespace::Namespace; use servo_util::str::DOMString; #[deriving(Encodable)] @@ -43,20 +43,9 @@ impl Attr { } } - pub fn new(window: &JS<Window>, local_name: DOMString, value: DOMString) -> JS<Attr> { - let name = local_name.clone(); - Attr::new_helper(window, local_name, value, name, Null, None) - } - - pub fn new_ns(window: &JS<Window>, local_name: DOMString, value: DOMString, - name: DOMString, namespace: Namespace, - prefix: Option<DOMString>) -> JS<Attr> { - Attr::new_helper(window, local_name, value, name, namespace, prefix) - } - - fn new_helper(window: &JS<Window>, local_name: DOMString, value: DOMString, - name: DOMString, namespace: Namespace, - prefix: Option<DOMString>) -> JS<Attr> { + pub fn new(window: &JS<Window>, local_name: DOMString, value: DOMString, + name: DOMString, namespace: Namespace, + prefix: Option<DOMString>) -> JS<Attr> { let attr = Attr::new_inherited(local_name, value, name, namespace, prefix); reflect_dom_object(~attr, window, AttrBinding::Wrap) } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 3361765e3c0..5be2466b80d 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -195,6 +195,13 @@ pub trait AttributeHandlers { fn set_attr(&mut self, name: DOMString, value: DOMString) -> ErrorResult; fn set_attribute(&mut self, namespace: Namespace, name: DOMString, value: DOMString) -> ErrorResult; + fn do_set_attribute(&mut self, local_name: DOMString, value: DOMString, + name: DOMString, namespace: Namespace, + prefix: Option<DOMString>, cb: |&JS<Attr>| -> bool); + fn SetAttribute(&mut self, name: DOMString, value: DOMString) -> ErrorResult; + fn SetAttributeNS(&mut self, namespace_url: Option<DOMString>, + name: DOMString, value: DOMString) -> ErrorResult; + fn after_set_attr(&mut self, local_name: DOMString, value: DOMString); fn remove_attribute(&mut self, namespace: Namespace, name: DOMString) -> ErrorResult; fn before_remove_attr(&mut self, local_name: DOMString, old_value: DOMString); @@ -253,15 +260,20 @@ impl AttributeHandlers for JS<Element> { let node: JS<Node> = NodeCast::from(self); node.get().wait_until_safe_to_modify_dom(); - // FIXME: reduce the time of `value.clone()`. - let idx = self.get().attrs.iter().position(|attr| { + let position: |&JS<Attr>| -> bool = if self.get().html_element_in_html_document() { - attr.get().local_name.eq_ignore_ascii_case(local_name) + |attr| attr.get().local_name.eq_ignore_ascii_case(local_name) } else { - attr.get().local_name == local_name - } - }); + |attr| attr.get().local_name == local_name + }; + self.do_set_attribute(name.clone(), value, name.clone(), namespace::Null, None, position); + Ok(()) + } + fn do_set_attribute(&mut self, local_name: DOMString, value: DOMString, + name: DOMString, namespace: Namespace, + prefix: Option<DOMString>, cb: |&JS<Attr>| -> bool) { + let idx = self.get().attrs.iter().position(cb); match idx { Some(idx) => { if namespace == namespace::Null { @@ -270,12 +282,12 @@ impl AttributeHandlers for JS<Element> { } self.get_mut().attrs[idx].get_mut().set_value(value.clone()); } + None => { let node: JS<Node> = NodeCast::from(self); let doc = node.get().owner_doc().get(); - let new_attr = Attr::new_ns(&doc.window, local_name.clone(), value.clone(), - name.clone(), namespace.clone(), - prefix); + let new_attr = Attr::new(&doc.window, local_name.clone(), value.clone(), + name, namespace.clone(), prefix); self.get_mut().attrs.push(new_attr); } } @@ -283,6 +295,87 @@ impl AttributeHandlers for JS<Element> { if namespace == namespace::Null { self.after_set_attr(local_name, value); } + } + + // http://dom.spec.whatwg.org/#dom-element-setattribute + fn SetAttribute(&mut self, name: DOMString, value: DOMString) -> ErrorResult { + let node: JS<Node> = NodeCast::from(self); + node.get().wait_until_safe_to_modify_dom(); + + // Step 1. + match xml_name_type(name) { + InvalidXMLName => return Err(InvalidCharacter), + _ => {} + } + + // Step 2. + let name = if self.get().html_element_in_html_document() { + name.to_ascii_lower() + } else { + name + }; + + // Step 3-5. + self.do_set_attribute(name.clone(), value, name.clone(), namespace::Null, None, |attr| { + attr.get().name == name + }); + Ok(()) + } + + fn SetAttributeNS(&mut self, namespace_url: Option<DOMString>, + name: DOMString, value: DOMString) -> ErrorResult { + let node: JS<Node> = NodeCast::from(self); + node.get().wait_until_safe_to_modify_dom(); + + // Step 1. + let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace_url)); + + let name_type = xml_name_type(name); + match name_type { + // Step 2. + InvalidXMLName => return Err(InvalidCharacter), + // Step 3. + Name => return Err(NamespaceError), + QName => {} + } + + // Step 4. + let (prefix, local_name) = get_attribute_parts(name.clone()); + match prefix { + Some(ref prefix_str) => { + // Step 5. + if namespace == namespace::Null { + return Err(NamespaceError); + } + + // Step 6. + if "xml" == prefix_str.as_slice() && namespace != namespace::XML { + return Err(NamespaceError); + } + + // Step 7b. + if "xmlns" == prefix_str.as_slice() && namespace != namespace::XMLNS { + return Err(NamespaceError); + } + }, + None => {} + } + + // Step 7a. + if "xmlns" == name && namespace != namespace::XMLNS { + return Err(NamespaceError); + } + + // Step 8. + if namespace == namespace::XMLNS && "xmlns" != name && Some(~"xmlns") != prefix { + return Err(NamespaceError); + } + + // Step 9. + self.do_set_attribute(local_name.clone(), value, name, namespace.clone(), prefix, |attr| { + attr.get().local_name == local_name && + attr.get().namespace == namespace + }); Ok(()) } @@ -443,6 +536,11 @@ impl Element { } impl Element { + // http://dom.spec.whatwg.org/#dom-element-namespaceuri + pub fn NamespaceURI(&self) -> DOMString { + self.namespace.to_str().to_owned() + } + // http://dom.spec.whatwg.org/#dom-element-tagname pub fn TagName(&self) -> DOMString { self.tag_name.to_ascii_upper() @@ -502,33 +600,19 @@ impl Element { } // http://dom.spec.whatwg.org/#dom-element-setattribute - pub fn SetAttribute(&mut self, abstract_self: &mut JS<Element>, + pub fn SetAttribute(&self, abstract_self: &mut JS<Element>, name: DOMString, value: DOMString) -> ErrorResult { - // FIXME: If name does not match the Name production in XML, throw an "InvalidCharacterError" exception. - let name = if self.html_element_in_html_document() { - name.to_ascii_lower() - } else { - name - }; - abstract_self.set_attr(name, value) + abstract_self.SetAttribute(name, value) } // http://dom.spec.whatwg.org/#dom-element-setattributens - pub fn SetAttributeNS(&mut self, + pub fn SetAttributeNS(&self, abstract_self: &mut JS<Element>, namespace_url: Option<DOMString>, name: DOMString, value: DOMString) -> ErrorResult { - let name_type = xml_name_type(name); - match name_type { - InvalidXMLName => return Err(InvalidCharacter), - Name => return Err(NamespaceError), - QName => {} - } - - let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace_url)); - abstract_self.set_attribute(namespace, name, value) + abstract_self.SetAttributeNS(namespace_url, name, value) } // http://dom.spec.whatwg.org/#dom-element-removeattribute diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 77ca388be9e..8207f778835 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -1372,10 +1372,10 @@ impl Node { copy_elem.namespace = node_elem.namespace.clone(); for attr in node_elem.attrs.iter() { let attr = attr.get(); - copy_elem.attrs.push(Attr::new_ns(&document.get().window, - attr.local_name.clone(), attr.value.clone(), - attr.name.clone(), attr.namespace.clone(), - attr.prefix.clone())); + copy_elem.attrs.push(Attr::new(&document.get().window, + attr.local_name.clone(), attr.value.clone(), + attr.name.clone(), attr.namespace.clone(), + attr.prefix.clone())); } }, _ => () @@ -1733,12 +1733,6 @@ impl Node { false } - // http://dom.spec.whatwg.org/#dom-node-namespaceuri - pub fn GetNamespaceURI(&self, abstract_self: &JS<Node>) -> Option<DOMString> { - let element: Option<JS<Element>> = ElementCast::to(abstract_self); - element.map(|element| element.get().namespace.to_str().to_owned()) - } - // http://dom.spec.whatwg.org/#dom-node-prefix pub fn GetPrefix(&self) -> Option<DOMString> { None diff --git a/src/components/script/dom/webidls/Element.webidl b/src/components/script/dom/webidls/Element.webidl index 2211fd5c887..aa0161204b0 100644 --- a/src/components/script/dom/webidls/Element.webidl +++ b/src/components/script/dom/webidls/Element.webidl @@ -18,10 +18,11 @@ interface Element : Node { We haven't moved these from Node to Element like the spec wants. [Throws] - readonly attribute DOMString? namespaceURI; readonly attribute DOMString? prefix; readonly attribute DOMString localName; */ + [Constant] + readonly attribute DOMString namespaceURI; // Not [Constant] because it depends on which document we're in [Pure] readonly attribute DOMString tagName; diff --git a/src/components/script/dom/webidls/Node.webidl b/src/components/script/dom/webidls/Node.webidl index 2a13d6ab381..39555e1e0d8 100644 --- a/src/components/script/dom/webidls/Node.webidl +++ b/src/components/script/dom/webidls/Node.webidl @@ -79,11 +79,9 @@ interface Node : EventTarget { // Mozilla-specific stuff // These have been moved to Element in the spec. - // If we move namespaceURI, prefix and localName to Element they should return + // If we move prefix and localName to Element they should return // a non-nullable type. [Constant] - readonly attribute DOMString? namespaceURI; - [Constant] readonly attribute DOMString? prefix; [Constant] readonly attribute DOMString? localName; diff --git a/src/test/content/test_element_attribute.html b/src/test/content/test_element_attribute.html index 8631138c767..d7ee6a23640 100644 --- a/src/test/content/test_element_attribute.html +++ b/src/test/content/test_element_attribute.html @@ -41,6 +41,25 @@ is(r2, null, "test4-1, Element.removeAttribute()."); } + { + test.setAttribute("xml:lang", "en"); + + let r1 = test.hasAttribute("xml:lang"); + is(r1, true, "test5-0, Element.setAttribute('xml:lang')."); + let r2 = test.getAttribute("xml:lang"); + is_not(r2, null, "test5-1, Element.setAttribute('xml:lang')."); + } + + should_throw(function () { + test.setAttributeNS("http://example.com", "xmlns", "foo"); + }); + should_throw(function () { + test.setAttributeNS("http://www.w3.org/2000/xmlns/", "attr", "value"); + }); + should_throw(function () { + test.setAttributeNS("http://www.w3.org/2000/xmlns/", "prefix:attr", "value"); + }); + finish(); </script> </body> |