# HG changeset patch # User Pascal Bellard # Date 1428932226 -7200 # Node ID f38bbdf61c95ed3492e136052e7fd51a383acfe1 # Parent dbf9d98daf6708891b880ced35e688ac9f2fe5f2 tazwikiss: min & max are redifined diff -r dbf9d98daf67 -r f38bbdf61c95 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css Sun Mar 22 22:19:17 2015 +0100 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.css Mon Apr 13 15:37:06 2015 +0200 @@ -8,6 +8,7 @@ .inputcalc { border: none; + min-width: 80px; width: 80px; font-size: inherit; padding: 2px; diff -r dbf9d98daf67 -r f38bbdf61c95 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Sun Mar 22 22:19:17 2015 +0100 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Mon Apr 13 15:37:06 2015 +0200 @@ -43,7 +43,7 @@ function buildCalc(id, rows, cols) { DATA[id] = {}; var maths = [ "abs", "acos", "asin", "atan", "atan2", "ceil", "cos", "exp", - "floor", "log", "max", "min", "pow", "random", "round", "sin", + "floor", "log", "pow", "random", "round", "sin", "tan", "sqrt", "PI", "E" ]; for (var i=0; v = maths[i]; i++) eval("DATA[id]."+v+" = DATA[id]."+v.toUpperCase()+" = Math."+v); @@ -85,7 +85,8 @@ { var e = document.getElementById("widthcalc"); e.innerHTML = s; - return (e.offsetWidth < 80 || s.charAt(0) == "=") ? 80 : e.offsetWidth; + return (e.offsetWidth < e.minWidth || s.charAt(0) == "=") ? + e.minWidth : e.offsetWidth; } function setCell(e, v)