summaryrefslogtreecommitdiffabout
diff options
context:
space:
mode:
authorArmaël Guéneau <armael.gueneau@ens-lyon.fr>2016-09-26 15:03:18 (CEST)
committer Armaël Guéneau <armael.gueneau@ens-lyon.fr>2016-09-26 15:04:21 (CEST)
commit4fb71c00c73cc94e81aeaf70dc2adf1f54e8c516 (patch)
tree0e343742744fbf8b1ddd32d6510f9ec9ac6a77bd
parent9bce2f7ce9ed8758ed8005ab899710f83ae38ef9 (diff)
downloaddict-4fb71c00c73cc94e81aeaf70dc2adf1f54e8c516.tar.gz
dict-4fb71c00c73cc94e81aeaf70dc2adf1f54e8c516.tar.bz2
Switch to jsoo ppx & update wrt tyxml's api
-rw-r--r--.merlin4
-rw-r--r--_tags2
-rw-r--r--dict.ml4
3 files changed, 6 insertions, 4 deletions
diff --git a/.merlin b/.merlin
index 0aa1332..3d73987 100644
--- a/.merlin
+++ b/.merlin
@@ -1,4 +1,6 @@
B _build
PKG batteries
PKG js_of_ocaml.tyxml
-PKG react \ No newline at end of file
+PKG js_of_ocaml.ppx
+PKG react
+PKG lwt \ No newline at end of file
diff --git a/_tags b/_tags
index b6dba3e..f1985df 100644
--- a/_tags
+++ b/_tags
@@ -1 +1 @@
-true: package(batteries), package(js_of_ocaml.syntax,js_of_ocaml,js_of_ocaml.tyxml), syntax(camlp4o), package(lwt) \ No newline at end of file
+true: package(batteries), package(js_of_ocaml,js_of_ocaml.ppx,js_of_ocaml.tyxml), package(lwt) \ No newline at end of file
diff --git a/dict.ml b/dict.ml
index 4b1eda5..30f69a2 100644
--- a/dict.ml
+++ b/dict.ml
@@ -29,7 +29,7 @@ let search, set_search = React.S.create ""
(* List of results *)
let results :
- Html5_types.div_content_fun Tyxml_js.Html5.elt list list list React.signal
+ Html_types.div_content_fun Tyxml_js.Html5.elt list list list React.signal
=
React.S.l2 (fun dict search ->
let len_search = String.length search in
@@ -116,7 +116,7 @@ let () =
Lwt.async (fun _ ->
Lwt_js_events.limited_loop ~elapsed_time:0.2
Lwt_js_events.input input_node (fun _ _ ->
- let text = Js.to_string ((To_dom.of_input input_box)##value) in
+ let text = Js.to_string ((To_dom.of_input input_box)##.value) in
set_search text;
return ()
)