From e5c543adfe4a27b347ce2e78a94727f1e50c8f43 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 16 May 2010 18:25:00 -0400 Subject: Fix width/height CSS choices for table rows/columns; stop warning about inability to embed type in JavaScript --- src/css.sml | 6 +++--- 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 => -- cgit v1.2.3