diff options
author | bors-servo <release+servo@mozilla.com> | 2013-08-02 10:54:29 -0700 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2013-08-02 10:54:29 -0700 |
commit | a4baa7fc6b072ef4be73a3fb46f3cdb81607192b (patch) | |
tree | 8a1b8abeb37ee82a24057ec10afa6058f275eff0 | |
parent | 2239436136e3544473728a7881799fdb4f367238 (diff) | |
parent | fad7df8e7ad317a2c4e33b7a02a0f9f3a479a1ee (diff) | |
download | servo-a4baa7fc6b072ef4be73a3fb46f3cdb81607192b.tar.gz servo-a4baa7fc6b072ef4be73a3fb46f3cdb81607192b.zip |
auto merge of #666 : kmcallister/servo/htmldocument, r=jdm
-rw-r--r-- | src/components/script/dom/htmldocument.rs | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index 50f2a7a0556..5cbb02b4b9b 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -80,15 +80,9 @@ impl HTMLDocument { } pub fn Links(&self) -> @mut HTMLCollection { - self.createHTMLCollection(|elem| { - if eq_slice(elem.tag_name, "a") || eq_slice(elem.tag_name, "area") { - match elem.get_attr("href") { - Some(_val) => true, - None() => false - } - } - else { false } - }) + self.createHTMLCollection(|elem| + (eq_slice(elem.tag_name, "a") || eq_slice(elem.tag_name, "area")) + && elem.get_attr("href").is_some()) } pub fn Forms(&self) -> @mut HTMLCollection { @@ -169,15 +163,8 @@ impl HTMLDocument { } pub fn Anchors(&self) -> @mut HTMLCollection { - self.createHTMLCollection(|elem| { - if eq_slice(elem.tag_name, "a") { - match elem.get_attr("name") { - Some(_val) => true, - None() => false - } - } - else { false } - }) + self.createHTMLCollection(|elem| + eq_slice(elem.tag_name, "a") && elem.get_attr("name").is_some()) } pub fn Applets(&self) -> @mut HTMLCollection { |