No longer use physical equality to compare JavaScript values

Author: vouillon

lib/js_of_ocaml/dom.ml

@@ -360,7 +360,7 @@ class type event_listener_options = object
 end
 
 let addEventListenerWithOptions (e : (< .. > as 'a) t) typ ?capture ?once ?passive h =
-  if (Js.Unsafe.coerce e)##.addEventListener == Js.undefined
+  if not (Js.Optdef.test (Js.Unsafe.coerce e)##.addEventListener)
   then
     let ev = (Js.string "on")##concat typ in
     let callback e = Js.Unsafe.call (h, e, [||]) in

lib/js_of_ocaml/dom_html.ml

@@ -2471,8 +2471,8 @@ let rec unsafeCreateElementEx ?_type ?name doc elt =
                  Js.Unsafe.coerce
                    (document##createElement (Js.string "<input name=\"x\">"))
                in
-               el##.tagName##toLowerCase == Js.string "input"
-               && el##.name == Js.string "x"
+               Js.equals el##.tagName##toLowerCase (Js.string "input")
+               && Js.equals el##.name (Js.string "x")
              with _ -> false
           then `Extended
           else `Standard;
@@ -2655,20 +2655,20 @@ let html_element : htmlElement t constr = Js.Unsafe.global##._HTMLElement
 
 module CoerceTo = struct
   let element : #Dom.node Js.t -> element Js.t Js.opt =
-    if def html_element == undefined
+    if not (Js.Optdef.test (def html_element))
     then
       (* ie < 9 does not have HTMLElement: we have to cheat to check
          that something is an html element *)
       fun e ->
-      if def (Js.Unsafe.coerce e)##.innerHTML == undefined
+      if not (Js.Optdef.test (def (Js.Unsafe.coerce e)##.innerHTML))
       then Js.null
       else Js.some (Js.Unsafe.coerce e)
     else
       fun e ->
       if Js.instanceof e html_element then Js.some (Js.Unsafe.coerce e) else Js.null
 
   let unsafeCoerce tag (e : #element t) =
-    if e##.tagName##toLowerCase == Js.string tag
+    if Js.equals e##.tagName##toLowerCase (Js.string tag)
     then Js.some (Js.Unsafe.coerce e)
     else Js.null
 
@@ -2795,7 +2795,7 @@ module CoerceTo = struct
   let video e = unsafeCoerce "video" e
 
   let unsafeCoerceEvent constr (ev : #event t) =
-    if def constr != undefined && Js.instanceof ev constr
+    if Js.Optdef.test (def constr) && Js.instanceof ev constr
     then Js.some (Js.Unsafe.coerce ev)
     else Js.null
 

lib/js_of_ocaml/dom_svg.ml

@@ -2054,7 +2054,7 @@ module CoerceTo = struct
     if Js.instanceof e svg_element then Js.some (Js.Unsafe.coerce e) else Js.null
 
   let unsafeCoerce (e : #element t) tag =
-    if e##.tagName##toLowerCase == Js.string tag
+    if Js.equals e##.tagName##toLowerCase (Js.string tag)
     then Js.some (Js.Unsafe.coerce e)
     else Js.null
 

lib/js_of_ocaml/file.ml

@@ -123,7 +123,7 @@ module CoerceTo = struct
     if instanceof e blob_constr then Js.some (Unsafe.coerce e : #blob t) else Js.null
 
   let string (e : file_any) =
-    if typeof e == string "string"
+    if Js.equals (typeof e) (string "string")
     then Js.some (Unsafe.coerce e : js_string t)
     else Js.null
 

lib/js_of_ocaml/json.ml

@@ -36,7 +36,7 @@ let json : json Js.t = Unsafe.global##._JSON
 
 let input_reviver =
   let reviver _this _key (value : Unsafe.any) : Obj.t =
-    if typeof value == string "string"
+    if Js.equals (typeof value) (string "string")
     then Obj.repr (to_bytestring (Unsafe.coerce value))
     else if instanceof value Js.array_empty
             && (Unsafe.coerce value)##.length == 4

lib/js_of_ocaml/url.ml

@@ -304,7 +304,7 @@ module Current = struct
 
   let arguments =
     decode_arguments_js_string
-      (if l##.search##charAt 0 == Js.string "?"
+      (if Js.equals (l##.search##charAt 0) (Js.string "?")
        then l##.search##slice_end 1
        else l##.search)
 

lib/js_of_ocaml/worker.ml

@@ -58,19 +58,19 @@ let worker = Unsafe.global##._Worker
 let create script = new%js worker (string script)
 
 let import_scripts scripts : unit =
-  if Unsafe.global##.importScripts == undefined
+  if not (Js.Optdef.test Unsafe.global##.importScripts)
   then invalid_arg "Worker.import_scripts is undefined";
   Unsafe.fun_call
     Unsafe.global##.importScripts
     (Array.map (fun s -> Unsafe.inject (string s)) (Array.of_list scripts))
 
 let set_onmessage handler =
-  if Unsafe.global##.onmessage == undefined
+  if not (Js.Optdef.test Unsafe.global##.onmessage)
   then invalid_arg "Worker.onmessage is undefined";
   let js_handler (ev : 'a messageEvent Js.t) = handler ev##.data in
   Unsafe.global##.onmessage := wrap_callback js_handler
 
 let post_message msg =
-  if Unsafe.global##.postMessage == undefined
+  if not (Js.Optdef.test Unsafe.global##.postMessage)
   then invalid_arg "Worker.onmessage is undefined";
   Unsafe.global##postMessage msg