Merge pull request #317 from xvw/fix-some-typos

Reintroduction of `formmethod`
ocsigen · Sep 27, 2023 · 3ffb4dc · 3ffb4dc
2 parents becaf65 + 9679ba1
commit 3ffb4dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/lib/html_f.ml b/lib/html_f.ml
@@ -255,7 +255,7 @@ struct
   let a_method x =
     user_attrib C.string_of_big_variant "method" x
 
-  let a_formmethod = a_method
+  let a_formmethod x = user_attrib C.string_of_big_variant "formmethod" x
 
   let a_enctype = string_attrib "enctype"
 

diff --git a/lib/html_sigs.mli b/lib/html_sigs.mli
@@ -503,9 +503,7 @@ module type T = sig
     [< | `Get | `Post] wrap -> [> | `Method] attrib
 
   val a_formmethod :
-    [< | `Get | `Post] wrap -> [> | `Method] attrib
-  [@@ocaml.deprecated "Use a_method"]
-  (** @deprecated Use a_method *)
+    [< | `Get | `Post] wrap -> [> | `Formmethod] attrib
 
   val a_multiple : unit -> [> | `Multiple] attrib
 

diff --git a/lib/html_types.mli b/lib/html_types.mli
@@ -2074,8 +2074,9 @@ type input_attrib =
     | `Checked
     | `Disabled
     | `Form
-    | `Formation
+    | `Formaction
     | `Formenctype
+    | `Formmethod
     | `Method
     | `Formnovalidate
     | `Formtarget
@@ -2138,6 +2139,7 @@ type button_attrib =
     | `Form
     | `Formaction
     | `Formenctype
+    | `Formmethod
     | `Method
     | `Formnovalidate
     | `Formtarget

diff --git a/test/test_html.ml b/test/test_html.ml
@@ -10,6 +10,10 @@ let html_elements = "html elements", tyxml_tests Html.[
   div [a []],
   "<div><a></a></div>" ;
 
+  "input",
+  input ~a:[a_formaction "post.html"; a_formmethod `Post] (),
+  "<input formaction=\"post.html\" formmethod=\"POST\"/>";
+
   "a",
   canvas [a []],
   "<canvas><a></a></canvas>";