Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned DOMTokenList code duplication

Browse source
This commit is contained in:
Bruno de Oliveira Abinader 2014-08-25 13:37:19 -04:00
parent caa55bf9ed
commit 400a31443b
1 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/components/script/dom/domtokenlist.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::attr::{Attr, TokenListAttrValue}; use dom::attr::Attr;
use dom::bindings::codegen::Bindings::DOMTokenListBinding; use dom::bindings::codegen::Bindings::DOMTokenListBinding;
use dom::bindings::codegen::Bindings::DOMTokenListBinding::DOMTokenListMethods; use dom::bindings::codegen::Bindings::DOMTokenListBinding::DOMTokenListMethods;
use dom::bindings::error::{Fallible, InvalidCharacter, Syntax}; use dom::bindings::error::{Fallible, InvalidCharacter, Syntax};
@ -71,31 +71,16 @@ impl<'a> PrivateDOMTokenListHelpers for JSRef<'a, DOMTokenList> {
impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> { impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> {
// http://dom.spec.whatwg.org/#dom-domtokenlist-length // http://dom.spec.whatwg.org/#dom-domtokenlist-length
fn Length(&self) -> u32 { fn Length(&self) -> u32 {
let attribute = self.attribute().root(); self.attribute().root().map(|attr| {
match attribute { attr.value().tokens().map(|tokens| tokens.len()).unwrap_or(0)
Some(attribute) => { }).unwrap_or(0) as u32
match *attribute.deref().value() {
TokenListAttrValue(_, ref indexes) => indexes.len() as u32,
_ => fail!("Expected a TokenListAttrValue"),
}
}
None => 0,
}
} }
// http://dom.spec.whatwg.org/#dom-domtokenlist-item // http://dom.spec.whatwg.org/#dom-domtokenlist-item
fn Item(&self, index: u32) -> Option<DOMString> { fn Item(&self, index: u32) -> Option<DOMString> {
let attribute = self.attribute().root(); self.attribute().root().and_then(|attr| attr.value().tokens().and_then(|mut tokens| {
attribute.and_then(|attribute| { tokens.idx(index as uint).map(|token| token.as_slice().to_string())
match *attribute.deref().value() { }))
TokenListAttrValue(ref value, ref indexes) => {
indexes.as_slice().get(index as uint).map(|&(start, end)| {
value.as_slice().slice(start, end).to_string()
})
},
_ => fail!("Expected a TokenListAttrValue"),
}
})
} }
fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<DOMString> { fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<DOMString> {