Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-20 21:16:49 +08:00
commit 8f90c257d6
1 changed files with 1 additions and 1 deletions

View File

@ -58,7 +58,7 @@ const toInt = (v, def = 0, min = null, max = null) => {
min = isFinite(min) ? (typeof min === 'string' ? parseInt(min) : min) : null
max = isFinite(max) ? (typeof max === 'string' ? parseInt(max) : max) : null
if (!isFinite(v)) return def
v = parseInt(v)
if (typeof v === 'string') v = parseInt(v)
if (min !== null && v < min) v = min
if (max !== null && v > max) v = max
return v