Merge pull request #1 from Engil/master

klakplok · klakplok · commit 1051121639fd · 2014-06-15T12:57:35.000+02:00
Fix compilation error with the latest goji and goji-lib-browser
diff --git a/descriptions/canvas.ml b/descriptions/canvas.ml
@@ -25,7 +25,7 @@ let canvas_component =
 	~doc:"A drawing context lets you draw on the canvas"
 	"gl_context" (abstract any) ;
       section "Canvas Element Management" [
-	inherits ([], "canvas") ([], "Document.node") "as_node" ;
+	inherits ([], "canvas") ([], "Browser.DOM.node") "as_node" ;
 	map_attribute "canvas" "width"
           ~doc:"Reflects the height HTML attribute, specifying the width of \
 		the coordinate space in CSS pixels."
@@ -38,15 +38,15 @@ let canvas_component =
           ~doc:"Obtain a 2D context, should work everywhere"
           [] 
 	  (abs "_"
-	     (set (arg 0) Const.(string "2d"))
+	     (set_const (arg 0) Const.(string "2d"))
 	     (call_method "getContext"))
           (abbrv "context") ;
 	def_method "canvas" "get_gl_context" 
           ~doc:"Obtain a 3D context, works only on browsers supporting  \
 		WebGL"
           []
 	  (abs "_"
-	     (set (arg 0) Const.(string "webgl"))
+	     (set_const (arg 0) Const.(string "webgl"))
 	     (call_method "getContext"))
           (abbrv "gl_context") ;
       ] ;
diff --git a/descriptions/raphael.ml b/descriptions/raphael.ml
@@ -208,7 +208,7 @@ let raphael_component =
               ~doc:"Gives you a reference to the DOM object, so you can assign \
                     event handlers or just mess around.\n\
                     Note: Don't mess with it."
-              ~read_only:true (abbrv "Document.node") ;
+              ~read_only:true (abbrv "Browser.DOM.node") ;
             map_attribute "t" "id"
               ~doc:"Unique id of the element. Especially usesful when you want \
                     to listen to events of the element, because all events are \
@@ -831,7 +831,7 @@ let raphael_component =
 
               [ labeled_arg "node"
                   ~doc:"the parent DOM node"
-                  ((abbrv "Document.node") @@ arg 0) ;
+                  ((abbrv "Browser.DOM.node") @@ arg 0) ;
                 labeled_arg "width"
                   ~doc:"the width in pixels"
                   (int @@ arg 1) ;
@@ -1550,7 +1550,7 @@ let raphael_component =
 
         [ labeled_arg "node"
             ~doc:"the parent DOM node"
-            ((abbrv "Document.node") @@ arg 0) ;
+            ((abbrv "Browser.DOM.node") @@ arg 0) ;
           labeled_arg "width"
             ~doc:"the width in pixels"
             (int @@ arg 1) ;
diff --git a/examples/cacophonie/index.html b/examples/cacophonie/index.html
@@ -1,5 +1,5 @@
 <html>
-  <body>
+  <body id="body">
   </body>
   <script src="libs.js" type="text/javascript"></script>
   <script src="main.js" type="text/javascript"></script>
diff --git a/examples/cacophonie/main.ml b/examples/cacophonie/main.ml
@@ -7,6 +7,8 @@ open JavaScript
 open Raphael
 open Howler
 
+module Dom = Browser.DOM
+
 let looping_rotation ?(center = 0., 0.) ?(start = 0.) element duration =
   let rec loop deg =
     let matrix = Matrix.identity () in
@@ -33,8 +35,13 @@ let scale =
   fun i -> scale.(i)
 
 let _ =
-  let canvas = Document.create "div" in
-  Document.append (Document.body ()) canvas ;
+  let document = Dom.document in
+  let body =
+    match Dom.get_element_by_id document "body" with
+    | None -> assert false
+    | Some elt -> elt in
+  let canvas = Dom.create_element_mode "div" in
+  Dom.append_child (Dom.element_as_node body) canvas;
   let paper = raphael_at_node canvas 500 500 in
   Paper.set_start paper ;
   for i = 15 downto 0 do
