@@ -71,9 +71,9 @@ jsModule modul =
71 concat [ "\nvar " ++ usefulFuncs ++ ";"
71 concat [ "\nvar " ++ usefulFuncs ++ ";"
72 , concatMap jsImport (imports modul)
72 , concatMap jsImport (imports modul)
73 , concat foreignImport
73 , concat foreignImport
74− , concatMap exportEvent $ foreignExports modul
75 , assign "_op" "{}"
74 , assign "_op" "{}"
76+ , concatMap exportEvent $ foreignExports modul
77 , jsExports
77 , jsExports
79 setup names = concatMap (\n -> globalAssign n $ n ++ " || {}") .
79 setup names = concatMap (\n -> globalAssign n $ n ++ " || {}") .
@@ -90,17 +90,17 @@ jsModule modul =
91 importEvent (js,base,elm,_) =
91 importEvent (js,base,elm,_) =
92 do v <- toJS' base
92 do v <- toJS' base
93− return $ concat [ "\nvar " ++ elm ++ "=Elm.Signal(elm).constant(" ++ v ++ ");"
93+ return $ concat [ "\nvar " ++ elm ++ "=Signal.constant(" ++ v ++ ");"
94 , "\ndocument.addEventListener('", js
94 , "\ndocument.addEventListener('", js
95 , "_' + elm.id, function(e) { elm.notify(", elm
95 , "_' + elm.id, function(e) { elm.notify(", elm
96 , ".id, e.value); });" ]
96 , ".id, e.value); });" ]
98 exportEvent (js,elm,_) =
98 exportEvent (js,elm,_) =
99− concat [ "\nlift(function(v) { "
99+ concat [ "\nA2( Signal.lift, function(v) { "
100 , "var e = document.createEvent('Event');"
100 , "var e = document.createEvent('Event');"
101 , "e.initEvent('", js, "_' + elm.id, true, true);"
101 , "e.initEvent('", js, "_' + elm.id, true, true);"
102 , "e.value = v;"
102 , "e.value = v;"
103− , "document.dispatchEvent(e); return v; })(", elm, ");" ]
103+ , "document.dispatchEvent(e); return v; }, ", elm, ");" ]
105jsImport (modul, method) =
105jsImport (modul, method) =
106 concat $ zipWith3 (\s n v -> s ++ assign' n v ++ ";") starters subnames values
106 concat $ zipWith3 (\s n v -> s ++ assign' n v ++ ";") starters subnames values
@@ -231,7 +231,7 @@ instance ToJS (Expr t v) where
231 _ -> jsObj $ ("ctor:" ++ show name) : fields
231 _ -> jsObj $ ("ctor:" ++ show name) : fields
232 where fields = zipWith (\n e -> "_" ++ show n ++ ":" ++ e) [0..] fs
232 where fields = zipWith (\n e -> "_" ++ show n ++ ":" ++ e) [0..] fs
234− Markdown doc -> return $ "text('" ++ pad ++ md ++ pad ++ "')"
234+ Markdown doc -> return $ "Text.text('" ++ pad ++ md ++ pad ++ "')"
235 where pad = "<div style=\"height:0;width:0;\"> </div>"
235 where pad = "<div style=\"height:0;width:0;\"> </div>"
236 md = formatMarkdown $ Pan.writeHtmlString Pan.def doc
236 md = formatMarkdown $ Pan.writeHtmlString Pan.def doc