aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorNova Fallen <nfallen@seas.upenn.edu>2015-10-25 13:05:22 -0400
committerNova Fallen <nfallen@seas.upenn.edu>2015-10-30 21:13:29 -0400
commit73c4af626ad261225d0fba23c78b1a8bceeac411 (patch)
tree7cf9bab0dd611678a85e9d64f6f981ac7e5c825a /components/script/dom
parentf6e3146de248554607790108680a43844dff70bf (diff)
downloadservo-73c4af626ad261225d0fba23c78b1a8bceeac411.tar.gz
servo-73c4af626ad261225d0fba23c78b1a8bceeac411.zip
Implement DOMStringMap::SupportedPropertyNames and NamedNodeMap::SupportedPropertyNames
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/domstringmap.rs3
-rw-r--r--components/script/dom/htmlelement.rs48
-rw-r--r--components/script/dom/namednodemap.rs6
3 files changed, 53 insertions, 4 deletions
diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs
index 95f727c93cb..bed48031786 100644
--- a/components/script/dom/domstringmap.rs
+++ b/components/script/dom/domstringmap.rs
@@ -61,7 +61,6 @@ impl DOMStringMapMethods for DOMStringMap {
// https://html.spec.whatwg.org/multipage/#the-domstringmap-interface:supported-property-names
fn SupportedPropertyNames(&self) -> Vec<DOMString> {
- // FIXME: unimplemented (https://github.com/servo/servo/issues/7273)
- vec![]
+ self.element.supported_prop_names_custom_attr().iter().cloned().collect()
}
}
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index b04082eae4d..ba2bcdacc16 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -27,6 +27,7 @@ use dom::node::{Node, SEQUENTIALLY_FOCUSABLE};
use dom::node::{document_from_node, window_from_node};
use dom::virtualmethods::VirtualMethods;
use msg::constellation_msg::FocusType;
+use std::ascii::AsciiExt;
use std::borrow::ToOwned;
use std::default::Default;
use std::intrinsics;
@@ -275,6 +276,45 @@ fn to_snake_case(name: DOMString) -> DOMString {
attr_name
}
+
+// https://html.spec.whatwg.org/multipage/#attr-data-*
+// if this attribute is in snake case with a data- prefix,
+// this function returns a name converted to camel case
+// without the data prefix.
+
+fn to_camel_case(name: &str) -> Option<DOMString> {
+ if !name.starts_with("data-") {
+ return None;
+ }
+ let name = &name[5..];
+ let has_uppercase = name.chars().any(|curr_char| {
+ curr_char.is_ascii() && curr_char.is_uppercase()
+ });
+ if has_uppercase {
+ return None;
+ }
+ let mut result = "".to_owned();
+ let mut name_chars = name.chars();
+ while let Some(curr_char) = name_chars.next() {
+ //check for hyphen followed by character
+ if curr_char == '\x2d' {
+ if let Some(next_char) = name_chars.next() {
+ if next_char.is_ascii() && next_char.is_lowercase() {
+ result.push(next_char.to_ascii_uppercase());
+ } else {
+ result.push(curr_char);
+ result.push(next_char);
+ }
+ } else {
+ result.push(curr_char);
+ }
+ } else {
+ result.push(curr_char);
+ }
+ }
+ Some(result)
+}
+
impl HTMLElement {
pub fn set_custom_attr(&self, name: DOMString, value: DOMString) -> ErrorResult {
if name.chars()
@@ -316,6 +356,14 @@ impl HTMLElement {
_ => false,
}
}
+
+ pub fn supported_prop_names_custom_attr(&self) -> Vec<DOMString> {
+ let element = self.upcast::<Element>();
+ element.attrs().iter().map(JS::root).filter_map(|attr| {
+ let raw_name = attr.r().local_name();
+ to_camel_case(&raw_name)
+ }).collect()
+ }
}
impl VirtualMethods for HTMLElement {
diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs
index 6070c0bb0c2..5c78de0ed51 100644
--- a/components/script/dom/namednodemap.rs
+++ b/components/script/dom/namednodemap.rs
@@ -85,8 +85,10 @@ impl NamedNodeMapMethods for NamedNodeMap {
item
}
+ // https://heycam.github.io/webidl/#dfn-supported-property-names
fn SupportedPropertyNames(&self) -> Vec<DOMString> {
- // FIXME: unimplemented (https://github.com/servo/servo/issues/7273)
- vec![]
+ self.owner.attrs().iter().map(JS::root).map(|attr| {
+ (**attr.name()).to_owned()
+ }).collect()
}
}