aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-06-21 03:54:23 -0400
committerGitHub <noreply@github.com>2018-06-21 03:54:23 -0400
commit388a6f80ac5100844c063475c655a74639050821 (patch)
tree8a574bf3aeb345501402bc1b66a2c08a1d50c4b6 /components/script/dom
parent8f84f893a7444cb28405774613f4eb4c82a0d076 (diff)
parenta271c615f7239bbede05b29d80474ad5323af362 (diff)
downloadservo-388a6f80ac5100844c063475c655a74639050821.tar.gz
servo-388a6f80ac5100844c063475c655a74639050821.zip
Auto merge of #21074 - jonathanKingston:toggle-attribute, r=Manishearth
Implement support for Element.toggleAttribute Copy implementation following from [Firefox implementation](https://bugzilla.mozilla.org/show_bug.cgi?id=1469592) of soon to be standardised [Element.toggleAttribute](https://github.com/whatwg/dom/pull/656). [Other implementers agreed to ship](https://github.com/whatwg/dom/issues/461) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes don't fix an issue however the wpt-tests will merge soon and will cause an issue etc. <!-- Either: --> - [X] There are tests for these changes **(coming soon in wpt from Firefox and I tested them on this patch)** <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21074) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/element.rs37
-rw-r--r--components/script/dom/webidls/Element.webidl2
2 files changed, 39 insertions, 0 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 00a2fee7513..547367e2f36 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -1680,6 +1680,43 @@ impl ElementMethods for Element {
self.get_attribute(namespace, &LocalName::from(local_name))
}
+ // https://dom.spec.whatwg.org/#dom-element-toggleattribute
+ fn ToggleAttribute(&self, name: DOMString, force: Option<bool>) -> Fallible<bool> {
+ // Step 1.
+ if xml_name_type(&name) == InvalidXMLName {
+ return Err(Error::InvalidCharacter);
+ }
+
+ // Step 3.
+ let attribute = self.GetAttribute(name.clone());
+
+ // Step 2.
+ let name = self.parsed_name(name);
+ match attribute {
+ // Step 4
+ None => match force {
+ // Step 4.1.
+ None | Some(true) => {
+ self.set_first_matching_attribute(
+ name.clone(), AttrValue::String(String::new()), name.clone(), ns!(), None,
+ |attr| *attr.name() == name);
+ Ok(true)
+ },
+ // Step 4.2.
+ Some(false) => Ok(false),
+ },
+ Some(_index) => match force {
+ // Step 5.
+ None | Some(false) => {
+ self.remove_attribute_by_name(&name);
+ Ok(false)
+ },
+ // Step 6.
+ Some(true) => Ok(true),
+ },
+ }
+ }
+
// https://dom.spec.whatwg.org/#dom-element-setattribute
fn SetAttribute(&self, name: DOMString, value: DOMString) -> ErrorResult {
// Step 1.
diff --git a/components/script/dom/webidls/Element.webidl b/components/script/dom/webidls/Element.webidl
index 5233bcf2cc9..48f7f25414e 100644
--- a/components/script/dom/webidls/Element.webidl
+++ b/components/script/dom/webidls/Element.webidl
@@ -41,6 +41,8 @@ interface Element : Node {
[Pure]
DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
[CEReactions, Throws]
+ boolean toggleAttribute(DOMString name, optional boolean force);
+ [CEReactions, Throws]
void setAttribute(DOMString name, DOMString value);
[CEReactions, Throws]
void setAttributeNS(DOMString? namespace, DOMString name, DOMString value);