Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 23:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2824 from jgraham/remove_attribute_str

Browse source 
Make Element.remove_attribute take &str instead of DOMString; r=Ms2ger
This commit is contained in:
Ms2ger 2014-07-13 20:18:36 +02:00
commit 91de702edb
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/script/dom/document.rs
View file

@ -438,7 +438,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
QName => {} QName => {}
} }
let (prefix_from_qname, local_name_from_qname) = get_attribute_parts(qualified_name); let (prefix_from_qname,
local_name_from_qname) = get_attribute_parts(qualified_name.as_slice());
match (&ns, prefix_from_qname.clone(), local_name_from_qname.as_slice()) { match (&ns, prefix_from_qname.clone(), local_name_from_qname.as_slice()) {
// throw if prefix is not null and namespace is null // throw if prefix is not null and namespace is null
(&namespace::Null, Some(_), _) => { (&namespace::Null, Some(_), _) => {

20
src/components/script/dom/element.rs
View file

@ -230,7 +230,7 @@ pub trait AttributeHandlers {
fn parse_attribute(&self, namespace: &Namespace, local_name: &str, fn parse_attribute(&self, namespace: &Namespace, local_name: &str,
value: DOMString) -> AttrValue; value: DOMString) -> AttrValue;
fn remove_attribute(&self, namespace: Namespace, name: DOMString) -> ErrorResult; fn remove_attribute(&self, namespace: Namespace, name: &str) -> ErrorResult;
fn notify_attribute_changed(&self, local_name: DOMString); fn notify_attribute_changed(&self, local_name: DOMString);
fn has_class(&self, name: &str) -> bool; fn has_class(&self, name: &str) -> bool;
@ -313,8 +313,8 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
} }
} }
fn remove_attribute(&self, namespace: Namespace, name: DOMString) -> ErrorResult { fn remove_attribute(&self, namespace: Namespace, name: &str) -> ErrorResult {
let (_, local_name) = get_attribute_parts(name.clone()); let (_, local_name) = get_attribute_parts(name);
let idx = self.deref().attrs.borrow().iter().map(|attr| attr.root()).position(|attr| { let idx = self.deref().attrs.borrow().iter().map(|attr| attr.root()).position(|attr| {
attr.local_name == local_name attr.local_name == local_name
@ -603,7 +603,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
} }
// Step 4. // Step 4.
let (prefix, local_name) = get_attribute_parts(name.clone()); let (prefix, local_name) = get_attribute_parts(name.as_slice());
match prefix { match prefix {
Some(ref prefix_str) => { Some(ref prefix_str) => {
// Step 5. // Step 5.
@ -651,7 +651,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
} else { } else {
name name
}; };
self.remove_attribute(namespace::Null, name) self.remove_attribute(namespace::Null, name.as_slice())
} }
// http://dom.spec.whatwg.org/#dom-element-removeattributens // http://dom.spec.whatwg.org/#dom-element-removeattributens
@ -659,7 +659,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
namespace: Option<DOMString>, namespace: Option<DOMString>,
localname: DOMString) -> ErrorResult { localname: DOMString) -> ErrorResult {
let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace)); let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace));
self.remove_attribute(namespace, localname) self.remove_attribute(namespace, localname.as_slice())
} }
// http://dom.spec.whatwg.org/#dom-element-hasattribute // http://dom.spec.whatwg.org/#dom-element-hasattribute
@ -759,14 +759,14 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
} }
} }
pub fn get_attribute_parts(name: DOMString) -> (Option<String>, String) { pub fn get_attribute_parts(name: &str) -> (Option<String>, String) {
//FIXME: Throw for XML-invalid names //FIXME: Throw for XML-invalid names
//FIXME: Throw for XMLNS-invalid names //FIXME: Throw for XMLNS-invalid names
let (prefix, local_name) = if name.as_slice().contains(":") { let (prefix, local_name) = if name.contains(":") {
let mut parts = name.as_slice().splitn(':', 1); let mut parts = name.splitn(':', 1);
(Some(parts.next().unwrap().to_string()), parts.next().unwrap().to_string()) (Some(parts.next().unwrap().to_string()), parts.next().unwrap().to_string())
} else { } else {
(None, name) (None, name.to_string())
}; };
(prefix, local_name) (prefix, local_name)