diff options
author | Ziv Scully <ziv@mit.edu> | 2015-11-12 08:46:51 -0500 |
---|---|---|
committer | Ziv Scully <ziv@mit.edu> | 2015-11-12 08:46:51 -0500 |
commit | 6205c6660874af4147828e2610ca5c2feec834ad (patch) | |
tree | 3ae1ba40102d50b2e3c434a993e92d3d21d24987 /src/settings.sml | |
parent | 7b14b2f01fd0218c0bbe0a5c4071fff190c91ce1 (diff) | |
parent | dc8c8ed99b79e4f3c3c38f131dd7563148524591 (diff) |
Merge.
Diffstat (limited to 'src/settings.sml')
-rw-r--r-- | src/settings.sml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/settings.sml b/src/settings.sml index 3694e1f3..f9125c64 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -343,6 +343,7 @@ val jsFuncsBase = basisM [("alert", "alert"), ("addSeconds", "addSeconds"), ("diffInSeconds", "diffInSeconds"), ("toMilliseconds", "toMilliseconds"), + ("fromMilliseconds", "fromMilliseconds"), ("diffInMilliseconds", "diffInMilliseconds"), ("fromDatetime", "fromDatetime"), @@ -376,7 +377,10 @@ val jsFuncsBase = basisM [("alert", "alert"), ("atom", "atom"), ("css_url", "css_url"), ("property", "property"), - ("giveFocus", "giveFocus")] + ("giveFocus", "giveFocus"), + + ("htmlifySpecialChar", "htmlifySpecialChar"), + ("chr", "chr")] val jsFuncs = ref jsFuncsBase fun setJsFuncs ls = jsFuncs := foldl (fn ((k, v), m) => M.insert (m, k, v)) jsFuncsBase ls fun jsFunc x = M.find (!jsFuncs, x) |