Permalink
Browse files

[fix] xhtml: rebase error on eea542f

  • Loading branch information...
1 parent 90f5f03 commit 537c44ac4fed341f694ba12fe83da9021b3c7da8 @OpaOnWindowsNow OpaOnWindowsNow committed Mar 7, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 stdlib/core/xhtml/xhtml.opa
@@ -850,6 +850,8 @@ Xhtml =
| _ -> void
)
+ (load_events, other_events) = List.partition((a -> match a.name:Dom.event.kind {ready} -> true | _ -> false), events)
+ (_, other_events_options) = List.partition((a -> match a.name:Dom.event.kind {ready} -> true | _ -> false), events_options)
other_events = // take care of event handler that can be inlined in html attribute
if XhtmlOptions.options.enable_inlined_event then
@@ -998,7 +1000,7 @@ Xhtml =
str
{js_code = js_code;
html_code = Buf.contents(html_buffer)}
- )
+ )
/**
* Convert xhtml to a readable text

0 comments on commit 537c44a

Please sign in to comment.