Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

adding macro to return string or url,

Browse source 
using that macro with the form action,
making the form submit process use base url,
adding tests.
This commit is contained in:
Jake Goldsborough 2016-09-20 21:16:51 -07:00
parent 1ed3521dcf
commit ce249d9384
6 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ impl HTMLFormElementMethods for HTMLFormElement {
make_setter!(SetAcceptCharset, "accept-charset"); make_setter!(SetAcceptCharset, "accept-charset");
// https://html.spec.whatwg.org/multipage/#dom-fs-action // https://html.spec.whatwg.org/multipage/#dom-fs-action
make_url_or_base_getter!(Action, "action"); make_string_or_document_url_getter!(Action, "action");
// https://html.spec.whatwg.org/multipage/#dom-fs-action // https://html.spec.whatwg.org/multipage/#dom-fs-action
make_setter!(SetAction, "action"); make_setter!(SetAction, "action");
@ -295,7 +295,7 @@ impl HTMLFormElement {
pub fn submit(&self, submit_method_flag: SubmittedFrom, submitter: FormSubmitter) { pub fn submit(&self, submit_method_flag: SubmittedFrom, submitter: FormSubmitter) {
// Step 1 // Step 1
let doc = document_from_node(self); let doc = document_from_node(self);
let base = doc.url(); let base = doc.base_url();
// TODO: Handle browsing contexts (Step 2, 3) // TODO: Handle browsing contexts (Step 2, 3)
// Step 4 // Step 4
if submit_method_flag == SubmittedFrom::NotFromForm && if submit_method_flag == SubmittedFrom::NotFromForm &&

20
components/script/dom/macros.rs
View file

@ -123,6 +123,26 @@ macro_rules! make_url_or_base_getter(
); );
); );
#[macro_export]
macro_rules! make_string_or_document_url_getter(
( $attr:ident, $htmlname:tt ) => (
fn $attr(&self) -> DOMString {
use dom::bindings::inheritance::Castable;
use dom::element::Element;
use dom::node::document_from_node;
let element = self.upcast::<Element>();
let val = element.get_string_attribute(&atom!($htmlname));
if val.is_empty() {
let doc = document_from_node(self);
DOMString::from(doc.url().clone().into_string())
} else {
val
}
}
);
);
#[macro_export] #[macro_export]
macro_rules! make_enumerated_getter( macro_rules! make_enumerated_getter(
( $attr:ident, $htmlname:tt, $default:expr, $(($choices: pat))|+) => ( ( $attr:ident, $htmlname:tt, $default:expr, $(($choices: pat))|+) => (

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

@ -37715,6 +37715,12 @@
"deleted_reftests": {}, "deleted_reftests": {},
"items": { "items": {
"testharness": { "testharness": {
"html/semantics/forms/the-form-element/form-action-url.html": [
{
"path": "html/semantics/forms/the-form-element/form-action-url.html",
"url": "/html/semantics/forms/the-form-element/form-action-url.html"
}
],
"html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html": [ "html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html": [
{ {
"path": "html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html", "path": "html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html",

9
tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-url.html Normal file
View file

@ -0,0 +1,9 @@
<!doctype html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
var t = async_test("Submit a form from an iframe with a base url");
var success = function() { t.done(); };
</script>
<iframe src="resources/form-action-url-iframe.html">

11
tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-action-url-iframe.html Normal file
View file

@ -0,0 +1,11 @@
<!doctype html>
<base href="target/"></base>
<form action="form-action-url-target.html">
<input type="submit" value="Submit" />
</form>
<script>
var form = document.getElementsByTagName("form")[0];
form.submit();
</script>

4
tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/target/form-action-url-target.html Normal file
View file

@ -0,0 +1,4 @@
<!doctype html>
<script>
window.parent.success();
</script>