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

Merge pull request #2876 from saneyuki/match

Browse source 
Implement Element.matches()
This commit is contained in:
Manish Goregaokar 2014-07-20 17:18:38 +05:30
commit 2ed7444624
3 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@
//! Element nodes.
use cssparser::tokenize;
use dom::attr::{Attr, ReplacedAttr, FirstSetAttr, AttrMethods, AttrHelpersForLayout};
use dom::attr::{AttrValue, StringAttrValue, UIntAttrValue};
use dom::attrlist::AttrList;
@ -13,7 +14,7 @@ use dom::bindings::js::{JS, JSRef, Temporary, TemporaryPushable};
use dom::bindings::js::{OptionalSettable, OptionalRootable, Root};
use dom::bindings::trace::Traceable;
use dom::bindings::utils::{Reflectable, Reflector};
use dom::bindings::error::{ErrorResult, Fallible, NamespaceError, InvalidCharacter};
use dom::bindings::error::{ErrorResult, Fallible, NamespaceError, InvalidCharacter, Syntax};
use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type};
use dom::clientrect::ClientRect;
use dom::clientrectlist::ClientRectList;
@ -28,6 +29,7 @@ use dom::nodelist::NodeList;
use dom::virtualmethods::{VirtualMethods, vtable_for};
use layout_interface::ContentChangedDocumentDamage;
use layout_interface::MatchSelectorsDocumentDamage;
use style::{matches_compound_selector, NamespaceMap, parse_selector_list};
use style;
use servo_util::namespace;
use servo_util::namespace::{Namespace, Null};
@ -452,6 +454,7 @@ pub trait ElementMethods {
fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>>;
fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>>;
fn Remove(&self);
fn Matches(&self, selectors: DOMString) -> Fallible<bool>;
}
impl<'a> ElementMethods for JSRef<'a, Element> {
@ -760,6 +763,25 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
let node: &JSRef<Node> = NodeCast::from_ref(self);
node.remove_self();
}
// http://dom.spec.whatwg.org/#dom-element-matches
fn Matches(&self, selectors: DOMString) -> Fallible<bool> {
let namespace = NamespaceMap::new();
match parse_selector_list(tokenize(selectors.as_slice()).map(|(token, _)| token).collect(),
&namespace) {
None => return Err(Syntax),
Some(ref selectors) => {
let root: &JSRef<Node> = NodeCast::from_ref(self);
for selector in selectors.iter() {
let mut shareable = false;
if matches_compound_selector(&*selector.compound_selectors, root, &mut shareable) {
return Ok(true);
}
}
}
}
Ok(false)
}
}
pub fn get_attribute_parts<'a>(name: &'a str) -> (Option<&'a str>, &'a str) {

3
src/components/script/dom/webidls/Element.webidl
View file

@ -46,6 +46,9 @@ interface Element : Node {
boolean hasAttribute(DOMString name);
boolean hasAttributeNS(DOMString? namespace, DOMString localName);
[Throws]
boolean matches(DOMString selectors);
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
HTMLCollection getElementsByClassName(DOMString classNames);

18
src/test/content/test_element_matches.html Normal file
View file

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<script src="harness.js"></script>
</head>
<body>
<div id="foo"></div>
<script>
let test = document.getElementById("foo");
is(test.matches("#foo"), true, "test-1");
is(test.matches("#not-foo"), false, "test-2");
finish();
</script>
</body>
</html>