Merge pull request #689 from ocsigen/dom-html

Adapt to Js_of_ocaml 6.0

Author: vouillon

.github/workflows/build.yml

@@ -40,6 +40,10 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           opam-pin: false
 
+      - run: |
+          opam pin add -n eliom https://github.com/ocsigen/eliom.git
+          opam pin add -n ocsigen-toolkit https://github.com/ocsigen/ocsigen-toolkit.git
+
       - run: opam pin add ocsigen-start.7.0.0 . --no-action
 
       - run: opam install .

opam

@@ -30,7 +30,7 @@ depends: [
   "yojson" {>= "1.6.0"}
   "resource-pooling" {>= "1.0" & < "2.0"}
   "cohttp-lwt-unix"
-  "js_of_ocaml" {>= "5.5.0"}
+  "js_of_ocaml" {>= "6.0.0"}
   "re" {>= "1.7.2"}
 ]
 depexts: [

src/os_tips.eliom

@@ -219,7 +219,7 @@ let%client display_bubble ?(a = []) ?arrow ?top ?left ?right ?bottom ?height
   let* () = Lwt_js.sleep delay in
   let box = To_dom.of_element box in
   Dom.appendChild parent_node box;
-  box##.style##.opacity := Js.def (Js.string "0");
+  box##.style##.opacity := Js.string "0";
   Eliom_lib.Option.iter
     (fun v -> box##.style##.top := Js.string (Printf.sprintf "%ipx" v))
     top;
@@ -266,7 +266,7 @@ let%client display_bubble ?(a = []) ?arrow ?top ?left ?right ?bottom ?height
            bec##.style##.borderLeft := Js.string "none")
     arrow;
   let* () = Lwt_js_events.request_animation_frame () in
-  box##.style##.opacity := Js.def (Js.string "1");
+  box##.style##.opacity := Js.string "1";
   Lwt.return_unit
 
 (* Function to be called on server to display a tip *)

template.distillery/PROJECT_NAME_mobile.eliom

@@ -67,13 +67,13 @@ let () =
 (* Reactivate comet on resume and online events *)
 
 let () =
-  Firebug.console##log (Js_of_ocaml.Js.string "adding resume/online listeners");
+  Console.console##log (Js_of_ocaml.Js.string "adding resume/online listeners");
   let activate ev =
     ignore
     @@ Js_of_ocaml.Dom.addEventListener Js_of_ocaml.Dom_html.document
          (Js_of_ocaml.Dom_html.Event.make ev)
          (Js_of_ocaml.Dom_html.handler (fun _ ->
-            Firebug.console##log (Js_of_ocaml.Js.string ev);
+            Console.console##log (Js_of_ocaml.Js.string ev);
             Eliom_comet.activate ();
             Js_of_ocaml.Js._true))
          Js_of_ocaml.Js._false
@@ -127,15 +127,15 @@ let universal_links () =
 let _ =
   Lwt.bind (universal_links ()) (function
     | Some universal_links ->
-        Js_of_ocaml.Firebug.console##log
+        Js_of_ocaml.Console.console##log
           (Js_of_ocaml.Js.string "Universal links: registering");
         universal_links##subscribe Js_of_ocaml.Js.null
           (Js_of_ocaml.Js.wrap_callback (fun (ev : event Js_of_ocaml.Js.t) ->
-             Js_of_ocaml.Firebug.console##log_2
+             Js_of_ocaml.Console.console##log_2
                (Js_of_ocaml.Js.string "Universal links: got link")
                ev##.url;
              change_page_uri (Js_of_ocaml.Js.to_string ev##.url)));
-        Js_of_ocaml.Firebug.console##log
+        Js_of_ocaml.Console.console##log
           (Js_of_ocaml.Js.string "Universal links: registered");
         Lwt.return_unit
     | None -> Lwt.return_unit)