diff options
| author | Michael Leibman <michael.leibman@gmail.com> | 2013-11-26 16:06:29 -0800 |
|---|---|---|
| committer | Michael Leibman <michael.leibman@gmail.com> | 2013-11-26 16:06:29 -0800 |
| commit | 886c08bce3574dc99c4b90ebded581489dfe8b7a (patch) | |
| tree | eefb4c23424537bd5ce6a1fa419ee7643cd09e81 /slick.grid.js | |
| parent | 34d768deeb04c64fdfa6b432ea352679f795aa9b (diff) | |
| parent | 29c200e11f22d25fd2b702a58ae541efa9422192 (diff) | |
| download | SlickGrid-886c08bce3574dc99c4b90ebded581489dfe8b7a.zip SlickGrid-886c08bce3574dc99c4b90ebded581489dfe8b7a.tar.gz SlickGrid-886c08bce3574dc99c4b90ebded581489dfe8b7a.tar.bz2 | |
Merge pull request #559 from oadam/bugfixAutoSizeColumn
bugfix column can grow larger than its maxwidth
Diffstat (limited to 'slick.grid.js')
| -rw-r--r-- | slick.grid.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/slick.grid.js b/slick.grid.js index 539b260..7b3c009 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -1073,10 +1073,14 @@ if (typeof Slick === "undefined") { var growProportion = availWidth / total;
for (i = 0; i < columns.length && total < availWidth; i++) {
c = columns[i];
- if (!c.resizable || c.maxWidth <= c.width) {
- continue;
+ var currentWidth = widths[i];
+ var growSize;
+
+ if (!c.resizable || c.maxWidth <= currentWidth) {
+ growSize = 0;
+ } else {
+ growSize = Math.min(Math.floor(growProportion * currentWidth) - currentWidth, (c.maxWidth - currentWidth) || 1000000) || 1;
}
- var growSize = Math.min(Math.floor(growProportion * c.width) - c.width, (c.maxWidth - c.width) || 1000000) || 1;
total += growSize;
widths[i] += growSize;
}
|