Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added document.activeElement attribute.

Browse source
This commit is contained in:
Maciej Skrzypkowski 2015-03-19 23:00:13 +01:00
parent 82f70c5d50
commit 7da356cd05
6 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/document.rs
View file

@ -834,6 +834,19 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
self.url().serialize() self.url().serialize()
} }
// https://html.spec.whatwg.org/multipage/interaction.html#dom-document-activeelement
fn GetActiveElement(self) -> Option<Temporary<Element>> {
// TODO: Step 2.
match self.get_focused_element() {
Some(element) => Some(element), // Step 3. and 4.
None => match self.GetBody() { // Step 5.
Some(body) => Some(ElementCast::from_temporary(body)),
None => self.GetDocumentElement(),
}
}
}
// http://dom.spec.whatwg.org/#dom-document-documenturi // http://dom.spec.whatwg.org/#dom-document-documenturi
fn DocumentURI(self) -> DOMString { fn DocumentURI(self) -> DOMString {
self.URL() self.URL()

10
components/script/dom/element.rs
View file

@ -435,6 +435,7 @@ pub trait ElementHelpers<'a> {
fn get_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>; fn get_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn get_important_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>; fn get_important_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn serialize(self, traversal_scope: TraversalScope) -> Fallible<DOMString>; fn serialize(self, traversal_scope: TraversalScope) -> Fallible<DOMString>;
fn get_root_element(self) -> Option<Temporary<Element>>;
} }
impl<'a> ElementHelpers<'a> for JSRef<'a, Element> { impl<'a> ElementHelpers<'a> for JSRef<'a, Element> {
@ -593,6 +594,15 @@ impl<'a> ElementHelpers<'a> for JSRef<'a, Element> {
Err(_) => panic!("Cannot serialize element"), Err(_) => panic!("Cannot serialize element"),
} }
} }
// https://html.spec.whatwg.org/multipage/infrastructure.html#root-element
fn get_root_element(self) -> Option<Temporary<Element>> {
let node: JSRef<Node> = NodeCast::from_ref(self);
match node.ancestors().last().map(ElementCast::to_ref) {
Some(n) => n.map(Temporary::from_rooted),
None => Some(self).map(Temporary::from_rooted),
}
}
} }
pub trait AttributeHandlers { pub trait AttributeHandlers {

1
components/script/dom/webidls/Document.webidl
View file

@ -13,6 +13,7 @@
interface Document : Node { interface Document : Node {
readonly attribute DOMImplementation implementation; readonly attribute DOMImplementation implementation;
readonly attribute DOMString URL; readonly attribute DOMString URL;
readonly attribute Element? activeElement;
readonly attribute DOMString documentURI; readonly attribute DOMString documentURI;
readonly attribute DOMString compatMode; readonly attribute DOMString compatMode;
readonly attribute DOMString characterSet; readonly attribute DOMString characterSet;

19
tests/content/test_document_activeElement.html Normal file
View file

@ -0,0 +1,19 @@
<!doctype html>
<html>
<head >
<title></title>
<script src="harness.js"></script>
</head>
<body>
<input id="foo" type="text"></input>
<script>
is_not(document.activeElement, null, "test_1.1, document.activeElement");
is(document.activeElement, document.body, "test_1.2, document.activeElement");
//TODO: uncomment following lines when focus() method will be available
//document.getElementById('foo').focus();
is_not(document.activeElement, null, "test_2.1, document.activeElement");
//is(document.activeElement, document.getElementById("foo"), "test_2.2, document.activeElement");
</script>
</body>
</html>

6
tests/wpt/metadata/html/dom/interfaces.html.ini
View file

@ -30,9 +30,6 @@
[Document interface: operation writeln(DOMString)] [Document interface: operation writeln(DOMString)]
expected: FAIL expected: FAIL
[Document interface: attribute activeElement]
expected: FAIL
[Document interface: operation hasFocus()] [Document interface: operation hasFocus()]
expected: FAIL expected: FAIL
@ -1125,9 +1122,6 @@
[Document interface: document.implementation.createDocument(null, "", null) must inherit property "defaultView" with the proper type (59)] [Document interface: document.implementation.createDocument(null, "", null) must inherit property "defaultView" with the proper type (59)]
expected: FAIL expected: FAIL
[Document interface: document.implementation.createDocument(null, "", null) must inherit property "activeElement" with the proper type (60)]
expected: FAIL
[Document interface: document.implementation.createDocument(null, "", null) must inherit property "hasFocus" with the proper type (61)] [Document interface: document.implementation.createDocument(null, "", null) must inherit property "hasFocus" with the proper type (61)]
expected: FAIL expected: FAIL

3
tests/wpt/metadata/html/semantics/disabled-elements/disabledElement.html.ini
View file

@ -1,8 +1,5 @@
[disabledElement.html] [disabledElement.html]
type: testharness type: testharness
[The body element must be the active element if no element is focused]
expected: FAIL
[A disabled <button> should not be focusable] [A disabled <button> should not be focusable]
expected: FAIL expected: FAIL