@@ -71,9 +71,9 @@ jsModule modul =
7171 concat [ "\nvar " ++ usefulFuncs ++ ";"
7272 , concatMap jsImport (imports modul)
7373 , concat foreignImport
74− , concatMap exportEvent $ foreignExports modul
7574 , assign "_op" "{}"
7675 , body
76+ , concatMap exportEvent $ foreignExports modul
7777 , jsExports
7878 ]
7979 setup names = concatMap (\n -> globalAssign n $ n ++ " || {}") .
@@ -90,17 +90,17 @@ jsModule modul =
9090
9191 importEvent (js,base,elm,_) =
9292 do v <- toJS' base
93− return $ concat [ "\nvar " ++ elm ++ "=Elm.Signal(elm).constant(" ++ v ++ ");"
93+ return $ concat [ "\nvar " ++ elm ++ "=Signal.constant(" ++ v ++ ");"
9494 , "\ndocument.addEventListener('", js
9595 , "_' + elm.id, function(e) { elm.notify(", elm
9696 , ".id, e.value); });" ]
9797
9898 exportEvent (js,elm,_) =
99− concat [ "\nlift(function(v) { "
99+ concat [ "\nA2( Signal.lift, function(v) { "
100100 , "var e = document.createEvent('Event');"
101101 , "e.initEvent('", js, "_' + elm.id, true, true);"
102102 , "e.value = v;"
103− , "document.dispatchEvent(e); return v; })(", elm, ");" ]
103+ , "document.dispatchEvent(e); return v; }, ", elm, ");" ]
104104
105105jsImport (modul, method) =
106106 concat $ zipWith3 (\s n v -> s ++ assign' n v ++ ";") starters subnames values
@@ -231,7 +231,7 @@ instance ToJS (Expr t v) where
231231 _ -> jsObj $ ("ctor:" ++ show name) : fields
232232 where fields = zipWith (\n e -> "_" ++ show n ++ ":" ++ e) [0..] fs
233233
234− Markdown doc -> return $ "text('" ++ pad ++ md ++ pad ++ "')"
234+ Markdown doc -> return $ "Text.text('" ++ pad ++ md ++ pad ++ "')"
235235 where pad = "<div style=\"height:0;width:0;\"> </div>"
236236 md = formatMarkdown $ Pan.writeHtmlString Pan.def doc
237237