Mercurial > urweb
comparison src/settings.sml @ 2280:985c8016b592
Merge.
author | Ziv Scully <ziv@mit.edu> |
---|---|
date | Thu, 12 Nov 2015 08:46:51 -0500 |
parents | 1e3ba868f8bf 43393a4a66ce |
children | 47d5c94aeeb8 |
comparison
equal
deleted
inserted
replaced
2279:32a407902d3b | 2280:985c8016b592 |
---|---|
341 ("htmlifyTime", "showTimeHtml"), | 341 ("htmlifyTime", "showTimeHtml"), |
342 ("toSeconds", "toSeconds"), | 342 ("toSeconds", "toSeconds"), |
343 ("addSeconds", "addSeconds"), | 343 ("addSeconds", "addSeconds"), |
344 ("diffInSeconds", "diffInSeconds"), | 344 ("diffInSeconds", "diffInSeconds"), |
345 ("toMilliseconds", "toMilliseconds"), | 345 ("toMilliseconds", "toMilliseconds"), |
346 ("fromMilliseconds", "fromMilliseconds"), | |
346 ("diffInMilliseconds", "diffInMilliseconds"), | 347 ("diffInMilliseconds", "diffInMilliseconds"), |
347 | 348 |
348 ("fromDatetime", "fromDatetime"), | 349 ("fromDatetime", "fromDatetime"), |
349 ("datetimeYear", "datetimeYear"), | 350 ("datetimeYear", "datetimeYear"), |
350 ("datetimeMonth", "datetimeMonth"), | 351 ("datetimeMonth", "datetimeMonth"), |
374 ("fresh", "fresh"), | 375 ("fresh", "fresh"), |
375 | 376 |
376 ("atom", "atom"), | 377 ("atom", "atom"), |
377 ("css_url", "css_url"), | 378 ("css_url", "css_url"), |
378 ("property", "property"), | 379 ("property", "property"), |
379 ("giveFocus", "giveFocus")] | 380 ("giveFocus", "giveFocus"), |
381 | |
382 ("htmlifySpecialChar", "htmlifySpecialChar"), | |
383 ("chr", "chr")] | |
380 val jsFuncs = ref jsFuncsBase | 384 val jsFuncs = ref jsFuncsBase |
381 fun setJsFuncs ls = jsFuncs := foldl (fn ((k, v), m) => M.insert (m, k, v)) jsFuncsBase ls | 385 fun setJsFuncs ls = jsFuncs := foldl (fn ((k, v), m) => M.insert (m, k, v)) jsFuncsBase ls |
382 fun jsFunc x = M.find (!jsFuncs, x) | 386 fun jsFunc x = M.find (!jsFuncs, x) |
383 fun addJsFunc (k, v) = jsFuncs := M.insert (!jsFuncs, k, v) | 387 fun addJsFunc (k, v) = jsFuncs := M.insert (!jsFuncs, k, v) |
384 fun allJsFuncs () = M.listItemsi (!jsFuncs) | 388 fun allJsFuncs () = M.listItemsi (!jsFuncs) |