diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2010-05-16 18:25:00 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2010-05-16 18:25:00 -0400 |
| commit | 46d21ab45cdc23c45296e1e336b7dbbf00849c56 (patch) | |
| tree | 41ee96d1986c8b69ffa4b2be9f9b5403144ca480 /src | |
| parent | 44ffaada5a0dc5ade3a73fe9b54fea1639eb2730 (diff) | |
Fix width/height CSS choices for table rows/columns; stop warning about inability to embed type in JavaScript
Diffstat (limited to 'src')
| -rw-r--r-- | src/css.sml | 6 | ||||
| -rw-r--r-- | src/jscomp.sml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/css.sml b/src/css.sml index 3df35ed1..31c4b9b1 100644 --- a/src/css.sml +++ b/src/css.sml @@ -66,10 +66,10 @@ val nada = ([], []) val block = ([Block], [OBlock, Width, Height]) val inline = ([], [NonReplacedInline]) val list = ([Block, List], [OBlock, Width, Height]) -val replaced = ([], [ ReplacedInline, Width, Height]) +val replaced = ([], [ReplacedInline, Width, Height]) val table = ([Block, Table], [OBlock, OTable, Width, Height]) -val tr = ([Block], [OBlock, Tr, Width]) -val td = ([Block, Td], [OBlock, OTd, Height]) +val tr = ([Block], [OBlock, Tr, Height]) +val td = ([Block, Td], [OBlock, OTd, Width]) val tags = [("span", inline), ("div", block), diff --git a/src/jscomp.sml b/src/jscomp.sml index 1e11fa32..d774cd74 100644 --- a/src/jscomp.sml +++ b/src/jscomp.sml @@ -1173,9 +1173,9 @@ fun process file = | EJavaScript (m, e') => (foundJavaScript := true; jsExp m outer (e', st) - handle CantEmbed t => ((*ErrorMsg.errorAt loc "Unable to embed type in JavaScript";*) - Print.preface ("Can't embed type in JavaScript", - MonoPrint.p_typ MonoEnv.empty t); + handle CantEmbed t => ((*ErrorMsg.errorAt loc "Unable to embed type in JavaScript"; + Print.preface ("Type", + MonoPrint.p_typ MonoEnv.empty t);*) (e, st))) | ESignalReturn e => |