Skip to content

Fixed compilation issue with js_of_ocaml 3.5.0 and 3.5.1. #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mseri merged 2 commits into from
Nov 29, 2019
Merged

Fixed compilation issue with js_of_ocaml 3.5.0 and 3.5.1. #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f83d773
Fixed compilation issur with js_of_ocaml 3.5.0 and 3.5.1.
Nov 29, 2019
319f391
Added lower bound for js_of_ocaml in related .opam file.
Nov 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rpclib-js.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ depends: [
"ocaml"
"dune" {>= "1.1.0"}
"rpclib" {>= "5.0.0"}
"js_of_ocaml" {>= "3.3.0"}
"js_of_ocaml-ppx" {>= "3.3.0"}
"js_of_ocaml" {>= "3.5.0"}
"js_of_ocaml-ppx" {>= "3.5.0"}
"lwt"
]
build: ["dune" "build" "-p" name "-j" jobs]
Expand Down
6 changes: 5 additions & 1 deletion src/js/rpc_client_js.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ let do_rpc enc dec content_type ~url call =
Js_of_ocaml.Js.wrap_callback (fun _ ->
match req ##. readyState with
| Js_of_ocaml.XmlHttpRequest.DONE ->
Lwt.wakeup w (dec (Js_of_ocaml.Js.to_string req ##. responseText))
Lwt.wakeup w (dec
(Js_of_ocaml.Js.Opt.case
req##.responseText
(fun () -> "")
(fun x -> Js_of_ocaml.Js.to_string x)))
| _ -> () ) ;
req ## send (Js_of_ocaml.Js.some (Js_of_ocaml.Js.string contents)) ;
Lwt.on_cancel res (fun () -> req ## abort) ;
Expand Down