summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-05-16 18:09:14 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-05-16 18:09:14 -0400
commit48105ce953be28a0858abdb28cff5c2fe443e376 (patch)
treeff24ac717027dba9e51bd258e0e8ae772143c7aa
parent817ce7421f990d3ee5ed75ebdc0560a22b96837f (diff)
Loading an FCKeditor
-rw-r--r--lib/js/urweb.js12
-rw-r--r--src/cjr_print.sml16
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index 04c1cfae..8890c446 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -228,6 +228,18 @@ function addNode(node) {
lastParent().appendChild(node);
}
+function setHTML(html) {
+ var x = document.createElement("span");
+ x.dead = false;
+ x.signal = null;
+ x.sources = null;
+ x.closures = null;
+ x.innerHTML = html;
+ addNode(x);
+ runScripts(x);
+ alert("HTML:\n" + html);
+}
+
var thisScript = null;
function runScripts(node) {
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 7f5dccde..683c2ddf 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -2841,14 +2841,22 @@ fun p_file env (ds, ps) =
string "uw_write(ctx, begin_xhtml);",
newline,
string "uw_set_script_header(ctx, \"",
- string (case side of
+ let
+ val scripts =
+ case side of
ServerOnly => ""
| _ => "<script src=\\\""
^ OS.Path.joinDirFile {dir = Settings.getUrlPrefix (),
file = "app.js"}
- ^ "\\\"></script>\\n"),
- p_list (fn x => string ("<script src=\\\"" ^ x ^ "\\\"></script>"))
- (Settings.getScripts ()),
+ ^ "\\\"></script>\\n"
+
+ val scripts = foldl (fn (x, scripts) =>
+ scripts
+ ^ "<script src=\\\"" ^ x ^ "\\\"></script>\\n")
+ scripts (Settings.getScripts ())
+ in
+ string scripts
+ end,
string "\");",
newline,
string "uw_set_needs_push(ctx, ",