Implement more NodeIterator attribute and methods

Just implement the skelectons
 - referenceNode attribute
 - nextNode() and previousNode()
This commit is contained in:
Jinwoo Song 2015-04-28 20:34:04 +09:00
parent 2701c264ab
commit 0e4c792dc5
2 changed files with 49 additions and 6 deletions

View file

@ -5,16 +5,20 @@
use dom::bindings::codegen::Bindings::NodeIteratorBinding; use dom::bindings::codegen::Bindings::NodeIteratorBinding;
use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods; use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods;
use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter;
use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, Temporary}; use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::js::MutNullableJS;
use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::document::{Document, DocumentHelpers}; use dom::document::{Document, DocumentHelpers};
use dom::node::{Node}; use dom::node::{Node};
use std::default::Default;
#[dom_struct] #[dom_struct]
pub struct NodeIterator { pub struct NodeIterator {
reflector_: Reflector, reflector_: Reflector,
root_node: JS<Node>, root_node: JS<Node>,
reference_node: MutNullableJS<Node>,
what_to_show: u32, what_to_show: u32,
filter: Filter filter: Filter
} }
@ -26,6 +30,7 @@ impl NodeIterator {
NodeIterator { NodeIterator {
reflector_: Reflector::new(), reflector_: Reflector::new(),
root_node: JS::from_rooted(root_node), root_node: JS::from_rooted(root_node),
reference_node: Default::default(),
what_to_show: what_to_show, what_to_show: what_to_show,
filter: filter filter: filter
} }
@ -73,8 +78,46 @@ impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> {
} }
} }
// https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode
fn GetReferenceNode(self) -> Option<Temporary<Node>> {
self.reference_node.get()
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
fn PreviousNode(self) -> Fallible<Option<Temporary<Node>>> {
self.prev_node()
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode
fn NextNode(self) -> Fallible<Option<Temporary<Node>>> {
self.next_node()
}
} }
/*
trait PrivateNodeIteratorHelpers {
//fn accept_node(self, node: JSRef<Node>) -> Fallible<u16>;
}
*/
pub trait NodeIteratorHelpers {
fn next_node(self) -> Fallible<Option<Temporary<Node>>>;
fn prev_node(self) -> Fallible<Option<Temporary<Node>>>;
}
impl<'a> NodeIteratorHelpers for JSRef<'a, NodeIterator> {
// https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode
fn next_node(self) -> Fallible<Option<Temporary<Node>>> {
Ok(None)
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
fn prev_node(self) -> Fallible<Option<Temporary<Node>>> {
Ok(None)
}
}
#[jstraceable] #[jstraceable]
pub enum Filter { pub enum Filter {
None, None,

View file

@ -14,8 +14,8 @@
interface NodeIterator { interface NodeIterator {
[Constant] [Constant]
readonly attribute Node root; readonly attribute Node root;
// [Pure] [Pure]
// readonly attribute Node? referenceNode; readonly attribute Node? referenceNode;
// [Pure] // [Pure]
// readonly attribute boolean pointerBeforeReferenceNode; // readonly attribute boolean pointerBeforeReferenceNode;
[Constant] [Constant]
@ -23,10 +23,10 @@ interface NodeIterator {
[Constant] [Constant]
readonly attribute NodeFilter? filter; readonly attribute NodeFilter? filter;
// [Throws] [Throws]
// Node? nextNode(); Node? nextNode();
// [Throws] [Throws]
// Node? previousNode(); Node? previousNode();
// void detach(); // void detach();
}; };