3 files changed, 78 insertions, 16 deletions
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index b44a1b400d8..b45e56910f8 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -12,6 +12,8 @@ use dom::window::Window;
 
 use js::jsapi::{JSObject, JSContext};
 
+use servo_util::tree::TreeUtils;
+
 use std::libc;
 use std::ptr;
 
@@ -64,33 +66,27 @@ impl HTMLDocument {
     }
 
     pub fn Images(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"img")
     }
 
     pub fn Embeds(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"embed")
     }
 
     pub fn Plugins(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.Embeds()
     }
 
     pub fn Links(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"link")
     }
 
     pub fn Forms(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"form")
     }
 
     pub fn Scripts(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"script")
     }
 
     pub fn Close(&self, _rv: &mut ErrorResult) {
@@ -163,13 +159,11 @@ impl HTMLDocument {
     }
 
     pub fn Anchors(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"a")
     }
 
     pub fn Applets(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)
+        self.createHTMLCollection(~"applet")
     }
 
     pub fn Clear(&self) {
@@ -178,6 +172,33 @@ impl HTMLDocument {
     pub fn GetAll(&self, _cx: *JSContext, _rv: &mut ErrorResult) -> *libc::c_void {
         ptr::null()
     }
+
+    fn createHTMLCollection(&self, elem_name: ~str) -> @mut HTMLCollection {
+        let (scope, cx) = self.get_scope_and_cx();
+        let mut elements = ~[];
+        let _ = for self.parent.root.traverse_preorder |child| {
+            if child.is_element() {
+                do child.with_imm_element |elem| {
+                    match elem_name {
+                        ~"link" => {
+                            if elem.tag_name == ~"a" || elem.tag_name == ~"area" {
+                                match elem.get_attr("href") {
+                                    Some(_val) => elements.push(child),
+                                    None() => ()
+                                }
+                            }                          
+                        }
+                        _ => {
+                            if elem.tag_name == elem_name {
+                                elements.push(child);
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        HTMLCollection::new(elements, cx, scope)
+    }
 }
 
 impl CacheableWrapper for HTMLDocument {
@@ -196,3 +217,4 @@ impl BindingObject for HTMLDocument {
         self.parent.GetParentObject(cx)
     }
 }
+
diff --git a/src/test/html/test_bindings.html b/src/test/html/test_bindings.html
index e93f363387c..8bf4d28504e 100644
--- a/src/test/html/test_bindings.html
+++ b/src/test/html/test_bindings.html
@@ -7,5 +7,10 @@
     <div id="second">ggg</div>
     <span id="third" name="test">hhhhhhhh</span>
     <div id="fourth">iiiiiiiiiiiiiiiiiii</div>
+    <a href="http://www.mozilla.org"></a>
+    <img src="test.jpg"/>
+    <embed></embed>
+    <form></form>
+    <applet></applet>
   </body>
 </html>
diff --git a/src/test/html/test_bindings.js b/src/test/html/test_bindings.js
index 796e2b8d453..a7cbb9c6c46 100644
--- a/src/test/html/test_bindings.js
+++ b/src/test/html/test_bindings.js
@@ -60,6 +60,41 @@ window.alert(tags[0].tagName);
 window.alert(tags[1]);
 window.alert(tags[1].tagName);
 window.alert(tags[2]);
+let tags = document.links;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.images;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.embeds;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.plugins;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.forms;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.scripts;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
+let tags = document.applets;
+window.alert(tags);
+window.alert(tags.length);
+window.alert(tags[0]);
+window.alert(tags[0].tagName);
 
 window.alert("DOMParser:");
 window.alert(DOMParser);