# HG changeset patch # User Pascal Bellard # Date 1424516271 -3600 # Node ID 673b33f90a097e2552e3d2f11b2941d0e13346a3 # Parent 49e5213991e6b6c24d346990091f6f775b59ff1f tazwikiss: enhance getWidth diff -r 49e5213991e6 -r 673b33f90a09 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css Sat Feb 21 11:04:03 2015 +0100 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css Sat Feb 21 11:57:51 2015 +0100 @@ -9,7 +9,7 @@ .inputcalc { border: none; width: 80px; - font-size: 14px; + font-size: inherit; padding: 2px; } @@ -28,4 +28,5 @@ .cellcalc { border: 1px solid #999; padding: 0; + font-size: 14px; } diff -r 49e5213991e6 -r 673b33f90a09 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Sat Feb 21 11:04:03 2015 +0100 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Sat Feb 21 11:57:51 2015 +0100 @@ -59,7 +59,7 @@ function getWidth(s) { var e = document.getElementById("widthcalc"); - e.innerHTML = s+" :"; + e.innerHTML = s; return (e.offsetWidth < 80 || s.charAt(0) == "=") ? 80 : e.offsetWidth; } @@ -92,7 +92,7 @@ var value = elm.title || ""; if (value.charAt(0) == "=") with (DATA[calcid]) return eval(value.substring(1)); - else return isNaN(value) ? value : parseFloat(value); + else return (value == "" || isNaN(value)) ? value : parseFloat(value); }; Object.defineProperty(DATA[calcid], cellid, {get:getter}); Object.defineProperty(DATA[calcid], cellid.toLowerCase(), {get:getter});