diff options
| author | Michael Leibman <michael.leibman@gmail.com> | 2013-09-12 17:51:57 -0700 |
|---|---|---|
| committer | Michael Leibman <michael.leibman@gmail.com> | 2013-09-12 17:51:57 -0700 |
| commit | f73a6363a241058003f09815408cbfa2a6a05b25 (patch) | |
| tree | 47f497308b7c2fc5d79132bc23552139013bd7da | |
| parent | f3f7dd74de73d2b9f6eaf91fd8ad8765c2b2aa9e (diff) | |
| parent | 69597253e0eb7313c7eb77ae6b7bb422e960703d (diff) | |
| download | SlickGrid-f73a6363a241058003f09815408cbfa2a6a05b25.zip SlickGrid-f73a6363a241058003f09815408cbfa2a6a05b25.tar.gz SlickGrid-f73a6363a241058003f09815408cbfa2a6a05b25.tar.bz2 | |
Merge pull request #699 from Morhaus/box-sizing
Support the "box-sizing: border-box;" css rule for column headers
| -rw-r--r-- | slick.grid.js | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/slick.grid.js b/slick.grid.js index a401070..50f4a8d 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -668,8 +668,8 @@ if (typeof Slick === "undefined") { tolerance: "intersection",
helper: "clone",
placeholder: "slick-sortable-placeholder ui-state-default slick-header-column",
- forcePlaceholderSize: true,
start: function (e, ui) {
+ ui.placeholder.width(ui.helper.outerWidth() - headerColumnWidthDiff);
$(ui.helper).addClass("slick-header-column-active");
},
beforeStop: function (e, ui) {
@@ -880,23 +880,27 @@ if (typeof Slick === "undefined") { el = $("<div class='ui-state-default slick-header-column' style='visibility:hidden'>-</div>").appendTo($headers);
headerColumnWidthDiff = headerColumnHeightDiff = 0;
- $.each(h, function (n, val) {
- headerColumnWidthDiff += parseFloat(el.css(val)) || 0;
- });
- $.each(v, function (n, val) {
- headerColumnHeightDiff += parseFloat(el.css(val)) || 0;
- });
+ if (el.css("box-sizing") != "border-box" && el.css("-moz-box-sizing") != "border-box" && el.css("-webkit-box-sizing") != "border-box") {
+ $.each(h, function (n, val) {
+ headerColumnWidthDiff += parseFloat(el.css(val)) || 0;
+ });
+ $.each(v, function (n, val) {
+ headerColumnHeightDiff += parseFloat(el.css(val)) || 0;
+ });
+ }
el.remove();
var r = $("<div class='slick-row' />").appendTo($canvas);
el = $("<div class='slick-cell' id='' style='visibility:hidden'>-</div>").appendTo(r);
cellWidthDiff = cellHeightDiff = 0;
- $.each(h, function (n, val) {
- cellWidthDiff += parseFloat(el.css(val)) || 0;
- });
- $.each(v, function (n, val) {
- cellHeightDiff += parseFloat(el.css(val)) || 0;
- });
+ if (el.css("box-sizing") != "border-box" && el.css("-moz-box-sizing") != "border-box" && el.css("-webkit-box-sizing") != "border-box") {
+ $.each(h, function (n, val) {
+ cellWidthDiff += parseFloat(el.css(val)) || 0;
+ });
+ $.each(v, function (n, val) {
+ cellHeightDiff += parseFloat(el.css(val)) || 0;
+ });
+ }
r.remove();
absoluteColumnMinWidth = Math.max(headerColumnWidthDiff, cellWidthDiff);
|