diff options
author | Rebecca Turner <me@re-becca.org> | 2016-01-07 02:48:15 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2016-01-07 04:21:07 +0300 |
commit | 74d92a08d72ce3603244de4bb3e3706d2b928cef (patch) | |
tree | c3593048c4fa4ee27ef6afc5632464558bc5cbb4 /node_modules/columnify/index.js | |
parent | 6b0031e28c0b10fb2622fdadde41f5cd294348e8 (diff) |
columnify@1.5.4
Some bug fixes around large inputs
Credit: @timoxley
Diffstat (limited to 'node_modules/columnify/index.js')
-rw-r--r-- | node_modules/columnify/index.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/node_modules/columnify/index.js b/node_modules/columnify/index.js index 227b41efc..221269b3e 100644 --- a/node_modules/columnify/index.js +++ b/node_modules/columnify/index.js @@ -135,6 +135,8 @@ module.exports = function(items, options = {}) { column.width = items .map(item => item[columnName]) .reduce((min, cur) => { + // if already at maxWidth don't bother testing + if (min >= column.maxWidth) return min return Math.max(min, Math.min(column.maxWidth, Math.max(column.minWidth, wcwidth(cur)))) }, 0) }) @@ -171,9 +173,11 @@ module.exports = function(items, options = {}) { let column = columns[columnName] column.width = items.map(item => { return item[columnName].reduce((min, cur) => { + if (min >= column.maxWidth) return min return Math.max(min, Math.min(column.maxWidth, Math.max(column.minWidth, wcwidth(cur)))) }, 0) }).reduce((min, cur) => { + if (min >= column.maxWidth) return min return Math.max(min, Math.min(column.maxWidth, Math.max(column.minWidth, cur))) }, 0) }) |