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

Move dirname collection to input

Browse source
This commit is contained in:
Dmitry Kolupaev 2020-01-30 23:06:22 +03:00
parent ef49f2e0eb
commit cb34e5c887
5 changed files with 43 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/htmlformelement.rs
View file

@ -745,8 +745,6 @@ impl HTMLFormElement {
.map(|field| (&*field.name, field.replace_value(charset))),
);
println!("New URL: {url}", url = &load_data.url);
self.plan_to_navigate(load_data, target);
}
@ -952,22 +950,7 @@ impl HTMLFormElement {
match element {
HTMLElementTypeId::HTMLInputElement => {
let input = child.downcast::<HTMLInputElement>().unwrap();
data_set.append(&mut input.form_datums(submitter, encoding));
// TODO: probably move to input.form_datums(...) function
// 4.10.18.2 https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#submitting-element-directionality:-the-dirname-attribute
let dirname: DOMString = input.DirName();
let dirname_str: &str = &*dirname;
if !dirname_str.is_empty() {
data_set.push(FormDatum {
ty: input.Type(),
name: DOMString::from_string(dirname_str.to_owned()),
value: FormDatumValue::String(DOMString::from(
input.directionality("auto"),
)),
});
}
},
HTMLElementTypeId::HTMLButtonElement => {
let button = child.downcast::<HTMLButtonElement>().unwrap();

18
components/script/dom/htmlinputelement.rs
View file

@ -1473,11 +1473,25 @@ impl HTMLInputElement {
}
// Step 5.12
vec![FormDatum {
let mut result = vec![FormDatum {
ty: ty.clone(),
name: name,
value: FormDatumValue::String(self.Value()),
}]
}];
// 4.10.18.2
// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#submitting-element-directionality:-the-dirname-attribute
let dirname: DOMString = self.DirName();
let directionality = DOMString::from(self.directionality("auto"));
if !dirname.is_empty() {
result.push(FormDatum {
ty: ty.clone(),
name: dirname.clone(),
value: FormDatumValue::String(directionality),
});
}
result
}
// https://html.spec.whatwg.org/multipage/#radio-button-group

1
components/script/dom/window.rs
View file

@ -2017,7 +2017,6 @@ impl Window {
}
// TODO: step 11, navigationType.
// Step 12, 13
println!("ScriptThread::navigate");
ScriptThread::navigate(pipeline_id, load_data, replace);
};
}

13
tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html
View file

@ -20,12 +20,17 @@
}
var t = async_test("submit element directionality");
setTimeout(function() {
document.querySelector("input").value="foobar";
document.querySelector("input").value = "foobar";
document.querySelector("button").click();
document.querySelector("iframe").onload = t.step_func_done(function() {
var iframe = document.querySelector("iframe");
iframe.onload = t.step_func(function() {
// The initial about:blank load event can be fired before the form navigation occurs.
// See https://github.com/whatwg/html/issues/490 for more information.
if(iframe.contentWindow.location.href == "about:blank") { return; }
assert_equals(getParameterByName("comment.dir"), "ltr");
t.done();
});
}, 3000);
</script>

13
tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl.html
View file

@ -7,7 +7,7 @@
<script src="/resources/testharnessreport.js"></script>
<div id="log"></div>
<form action="dirname-ltr-iframe.html" method=get target="iframe">
<p><label>Comment: <input type=text id="comment-input" name="comment" dirname="comment.dir" required/></label></p>
<p><label>Comment: <input type=text name="comment" dirname="comment.dir" required/></label></p>
<p><button type=submit>Post Comment</button></p>
</form>
<iframe name="iframe"></iframe>
@ -20,13 +20,18 @@
}
var t = async_test("submit element directionality");
setTimeout(3000, function() {
var rtlValue = "مرحبا";
document.querySelector("input").value = rtlValue;
document.querySelector("button").click();
document.querySelector("iframe").onload = t.step_func_done(function() {
var iframe = document.querySelector("iframe");
iframe.onload = t.step_func(function() {
// The initial about:blank load event can be fired before the form navigation occurs.
// See https://github.com/whatwg/html/issues/490 for more information.
if(iframe.contentWindow.location.href == "about:blank") { return; }
assert_equals(getParameterByName("comment.dir"), "rtl");
t.done();
});
}, 3000);
</script>