Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement selectedIndex property on <select>.

Browse source
This commit is contained in:
Corey Farwell 2016-10-16 08:46:23 -04:00
parent f90b256472
commit bec5bf49bd
5 changed files with 110 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/htmlselectelement.rs
View file

@ -299,6 +299,36 @@ impl HTMLSelectElementMethods for HTMLSelectElement {
opt.set_selectedness(false);
}
}
// https://html.spec.whatwg.org/multipage/#dom-select-selectedindex
fn SelectedIndex(&self) -> i32 {
self.upcast::<Node>()
.traverse_preorder()
.filter_map(Root::downcast::<HTMLOptionElement>)
.enumerate()
.filter(|&(_, ref opt_elem)| opt_elem.Selected())
.map(|(i, _)| i as i32)
.next()
.unwrap_or(-1)
}
// https://html.spec.whatwg.org/multipage/#dom-select-selectedindex
fn SetSelectedIndex(&self, index: i32) {
let mut opt_iter = self.upcast::<Node>()
.traverse_preorder()
.filter_map(Root::downcast::<HTMLOptionElement>);
for opt in opt_iter.by_ref().take(index as usize) {
opt.set_selectedness(false);
}
if let Some(opt) = opt_iter.next() {
opt.set_selectedness(true);
opt.set_dirtiness(true);
// Reset remaining <option> elements
for opt in opt_iter {
opt.set_selectedness(false);
}
}
}
}
impl VirtualMethods for HTMLSelectElement {

2
components/script/dom/webidls/HTMLSelectElement.webidl
View file

@ -25,7 +25,7 @@ interface HTMLSelectElement : HTMLElement {
//setter void (unsigned long index, HTMLOptionElement? option);
//readonly attribute HTMLCollection selectedOptions;
// attribute long selectedIndex;
attribute long selectedIndex;
attribute DOMString value;
//readonly attribute boolean willValidate;

6
tests/wpt/metadata/MANIFEST.json
View file

@ -37763,6 +37763,12 @@
"url": "/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html"
}
],
"html/semantics/forms/the-select-element/selected-index.html": [
{
"path": "html/semantics/forms/the-select-element/selected-index.html",
"url": "/html/semantics/forms/the-select-element/selected-index.html"
}
],
"html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html": [
{
"path": "html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html",

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

@ -3708,9 +3708,6 @@
[HTMLSelectElement interface: attribute selectedOptions]
expected: FAIL
[HTMLSelectElement interface: attribute selectedIndex]
expected: FAIL
[HTMLSelectElement interface: attribute willValidate]
expected: FAIL
@ -3738,9 +3735,6 @@
[HTMLSelectElement interface: document.createElement("select") must inherit property "selectedOptions" with the proper type (17)]
expected: FAIL
[HTMLSelectElement interface: document.createElement("select") must inherit property "selectedIndex" with the proper type (18)]
expected: FAIL
[HTMLSelectElement interface: document.createElement("select") must inherit property "willValidate" with the proper type (20)]
expected: FAIL

73
tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/selected-index.html Normal file
View file

@ -0,0 +1,73 @@
<!doctype html>
<meta charset=utf-8>
<title>HTMLSelectElement selectedIndex</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div id=log></div>
<form id=form>
<select id=empty></select>
<select id=default>
<option></option>
<option></option>
<option></option>
<option></option>
<option></option>
</select>
<select id=disabled>
<option disabled></option>
<option></option>
</select>
<select id=selected>
<option></option>
<option selected></option>
</select>
</form>
<script>
test(function () {
var select = document.getElementById('empty');
assert_equals(select.selectedIndex, -1);
}, "get empty");
test(function () {
var select = document.getElementById('default');
assert_equals(select.selectedIndex, 0);
}, "get default");
test(function () {
var select = document.getElementById('disabled');
assert_equals(select.selectedIndex, 1);
}, "get disabled");
test(function () {
var select = document.getElementById('selected');
assert_equals(select.selectedIndex, 1);
}, "get unselected");
test(function () {
var select = document.getElementById('empty');
select.selectedIndex = 1;
assert_equals(select.selectedIndex, -1);
}, "set empty");
test(function () {
var select = document.getElementById('default');
assert_equals(select.selectedIndex, 0);
select.selectedIndex = 2;
assert_equals(select.selectedIndex, 2);
}, "set");
test(function () {
var select = document.getElementById('selected');
var form = document.getElementById('form');
assert_equals(select.selectedIndex, 1);
select.selectedIndex = 0;
assert_equals(select.selectedIndex, 0);
form.reset();
assert_equals(select.selectedIndex, 1);
}, "set and reset");
</script>