[gxml] Implemented CssSelectorParser E:root pseudo selector
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Implemented CssSelectorParser E:root pseudo selector
- Date: Fri, 8 Sep 2017 17:04:10 +0000 (UTC)
commit 85f3ea78a900bed127cf71fe52bd43ec37072f73
Author: Daniel Espinosa <esodan gmail com>
Date: Fri Sep 8 08:40:30 2017 -0700
Implemented CssSelectorParser E:root pseudo selector
gxml/CssSelectorParser.vala | 13 ++++++++-
test/CssSelectorTest.vala | 59 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/gxml/CssSelectorParser.vala b/gxml/CssSelectorParser.vala
index 30b1ea8..8be1b14 100644
--- a/gxml/CssSelectorParser.vala
+++ b/gxml/CssSelectorParser.vala
@@ -218,6 +218,7 @@ public class GXml.CssSelectorParser : GLib.Object {
while (css.get_next_char (ref position, out u) && (u.isalnum() || u == '-' || u == ':'))
sb.append_unichar (u);
string[] valid_selectors = {
+ "root",
"checked",
"disabled",
"empty",
@@ -230,7 +231,7 @@ public class GXml.CssSelectorParser : GLib.Object {
"last-of-type"
};
if (!(sb.str in valid_selectors))
- throw new CssSelectorError.INVALID (_("Invalid pseudo class selector"));
+ throw new CssSelectorError.INVALID (_("Invalid pseudo class selector %s").printf
(sb.str));
CssSelectorData data = new CssSelectorData.with_values (CssSelectorType.PSEUDO, sb.str, "");
list.add (data);
}
@@ -356,6 +357,16 @@ public class GXml.CssSelectorParser : GLib.Object {
if (p == null) return false;
if (p.has_suffix (s.value+"-")) return true;
}
+ if (is_element && s.selector_type == CssSelectorType.PSEUDO) {
+ if (s.data.down () == "root") {
+ if (element is GomElement)
+ if (element != element.owner_document.document_element)
return false;
+ if (element is GElement)
+ if ((element as GNode).get_internal_node ()
+ !=
(element.owner_document.document_element as GNode).get_internal_node ()) return false;
+ if (element.node_name.down () ==
element.owner_document.document_element.node_name.down ()) return true;
+ }
+ }
if (s.selector_type == CssSelectorType.CLASS) {
var p = element.get_attribute ("class");
if (p == null) return false;
diff --git a/test/CssSelectorTest.vala b/test/CssSelectorTest.vala
index 347dec9..6d30ae9 100644
--- a/test/CssSelectorTest.vala
+++ b/test/CssSelectorTest.vala
@@ -374,5 +374,64 @@ class CssSelectorTest : GXmlTest {
warning ("ERROR: "+e.message);
}
});
+ Test.add_func ("/gxml/css-selector/element/pseudo/root", () => {
+ try {
+ var cp = new CssSelectorParser ();
+ cp.parse ("toplevel:root");
+ foreach (CssSelectorData sel in cp.selectors) {
+ message ("Type: "+sel.selector_type.to_string ()+" : "+sel.data+" :
"+sel.value);
+ }
+ assert (cp.selectors.size == 3);
+ var s = cp.selectors[0];
+ assert (s != null);
+ assert (s.selector_type == CssSelectorType.ELEMENT);
+ var si = cp.selectors[1];
+ assert (si != null);
+ assert (si.selector_type == CssSelectorType.INSIDE);
+ var sa = cp.selectors[2];
+ assert (sa != null);
+ assert (sa.selector_type == CssSelectorType.PSEUDO);
+ var d = new GomDocument ();
+ var r = d.create_element ("toplevel");
+ d.append_child (r);
+ var c1 = d.create_element ("child");
+ r.append_child (c1);
+ var c2 = d.create_element ("child");
+ c2.set_attribute ("prop", "subval");
+ r.append_child (c2);
+ var c3 = d.create_element ("child");
+ c3.set_attribute ("prop", "techval");
+ r.append_child (c3);
+ var c4 = d.create_element ("child");
+ c4.set_attribute ("prop", "secondaryvalue");
+ r.append_child (c4);
+ assert (cp.match (r));
+ assert (!cp.match (c1));
+ assert (!cp.match (c2));
+ assert (!cp.match (c3));
+ assert (!cp.match (c4));
+ var d2 = new GDocument () as DomDocument;
+ var r2 = d2.create_element ("toplevel");
+ d2.append_child (r2);
+ var c1g = d2.create_element ("child");
+ r2.append_child (c1g);
+ var c2g = d2.create_element ("child");
+ c2g.set_attribute ("prop", "subval");
+ r2.append_child (c2g);
+ var c3g = d2.create_element ("child");
+ c3g.set_attribute ("prop", "techval");
+ r2.append_child (c3g);
+ var c4g = d2.create_element ("child");
+ c4g.set_attribute ("prop", "secondaryvalue");
+ r2.append_child (c4g);
+ assert (cp.match (r));
+ assert (!cp.match (c1));
+ assert (!cp.match (c2));
+ assert (!cp.match (c3));
+ assert (!cp.match (c4));
+ } catch (GLib.Error e){
+ warning ("ERROR: "+e.message);
+ }
+ });
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]