Merge pull request #167 from ocsigen/fixspinn

Ot_spinner: Error message improvements

Author: Jan Rochel

css/ot_icons.css

@@ -58,6 +58,7 @@
     background-color: black ;
 }
 
+.ot-icon-error::before,
 .ot-icon-question::before {
     content: '?' ;
     display: block ;

src/widgets/ot_spinner.eliom

@@ -23,12 +23,31 @@
 [%%shared open Eliom_content.Html.F ]
 [%%client open Eliom_shared ]
 
-let%shared default_fail e =
+let%shared default_fail_fun e =
   [
     if Eliom_config.get_debugmode ()
     then em [ pcdata (Printexc.to_string e) ]
-    else em ~a:[ a_class ["ot-icon-question"] ]
-        [ pcdata (Printexc.to_string e) ] ]
+    else begin
+      let e = Printexc.to_string e in
+      ignore [%client (Firebug.console##error
+                         (Js.string ("Ot_spinner content failed with "^ ~%e))
+                       : unit)];
+      em ~a:[ a_class ["ot-icon-error"] ] []
+    end
+  ]
+
+let%shared default_fail_ref
+  : (exn -> Html_types.div_content Eliom_content.Html.elt list) ref
+  = ref default_fail_fun
+
+let%shared default_fail e =
+  (!default_fail_ref e
+   : Html_types.div_content Eliom_content.Html.elt list
+   :> [< Html_types.div_content ] Eliom_content.Html.elt list)
+
+let%shared set_default_fail f = default_fail_ref :=
+    (f : exn -> [< Html_types.div_content ] Eliom_content.Html.elt list
+     :> exn -> Html_types.div_content Eliom_content.Html.elt list)
 
 let%server with_spinner ?(a = []) ?fail thread =
   let a = (a :> Html_types.div_attrib attrib list) in
@@ -72,7 +91,10 @@ let cl_spinner = "ot-icon-spinner"
 
 let replace_content ?fail elt thread =
   let fail = match fail with
-    | Some fail -> fail
+    | Some fail ->
+      (fail
+       : exn -> [< Html_types.div_content ] Eliom_content.Html.elt list Lwt.t
+       :> exn -> Html_types.div_content Eliom_content.Html.elt list Lwt.t)
     | None      -> fun e -> Lwt.return (default_fail e)
   in
   inc_active_spinners ();

src/widgets/ot_spinner.eliomi

@@ -33,6 +33,9 @@
 
     If you want the spinner on both sides, you can use [with_spinner_no_lwt]
     and [Eliom_content.Html.C.node].
+
+    Function [fail] will be used to display block in case an exception is
+    raised.
  *)
 val with_spinner :
   ?a:[< Html_types.div_attrib ] Eliom_content.Html.attrib list ->
@@ -57,9 +60,9 @@ val with_spinner_no_lwt :
     generated by [thread]. The [elt] has be a D-node. Until [thread] is
     finished [elt] is transformed into a spinner. *)
 val replace_content :
-  ?fail:(exn -> ([> Html_types.em] as 'b) Eliom_content.Html.elt list Lwt.t) ->
+  ?fail:(exn -> [< Html_types.div_content] Eliom_content.Html.elt list Lwt.t) ->
   'a Eliom_content.Html.elt ->
-  'b Eliom_content.Html.elt list Lwt.t -> unit Lwt.t
+  Html_types.div_content Eliom_content.Html.elt list Lwt.t -> unit Lwt.t
 
 (** the number of spinners currently spinning *)
 val num_active_spinners : int Eliom_shared.React.S.t
@@ -68,3 +71,7 @@ val num_active_spinners : int Eliom_shared.React.S.t
 val onloaded : unit Eliom_shared.React.E.t
 (** do an action once no spinners are spinning (could be right away) *)
 val when_loaded : (unit -> unit) -> unit
+
+(** Change the default function used to display error messages *)
+val set_default_fail :
+  (exn -> [< Html_types.div_content ] Eliom_content.Html.elt list) -> unit