Skip to content

Commit c2e990a

Browse files
francisbessetfrancisbesset
committed
Refactored headerRows usage
1 parent 3a0028d commit c2e990a

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

‎js/jquery.fn.gantt.js

+23-19
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,10 @@
257257
// **Render the grid**
258258
render: function (element) {
259259
var content = $('<div class="fn-content"/>');
260+
260261
var $leftPanel = core.leftPanel(element);
261262
content.append($leftPanel);
263+
262264
var $rightPanel = core.rightPanel(element, $leftPanel);
263265
var mLeft, hPos;
264266

@@ -320,7 +322,6 @@
320322
/* Left panel */
321323
var ganttLeftPanel = $('<div class="leftPanel"/>')
322324
.append($('<div class="row spacer"/>')
323-
.css("height", tools.getCellSize() * element.headerRows + "px")
324325
.css("width", "100%"));
325326

326327
var entries = [];
@@ -409,7 +410,7 @@
409410

410411
// Creates and return the right panel containing the year/week/day
411412
// header
412-
rightPanel: function (element, leftPanel /* <- never used? */) {
413+
rightPanel: function (element, $leftPanel) {
413414

414415
var range = null;
415416
// Days of the week have a class of one of
@@ -552,6 +553,8 @@
552553
dataPanel.append($('<div class="row"/>').html(dowArr.join("")));
553554
dataPanel.append($('<div class="row"/>').html(horArr.join("")));
554555

556+
element.headerRows = 5;
557+
555558
break;
556559

557560
// **Weeks**
@@ -617,6 +620,8 @@
617620

618621
dataPanel.append(yearArr.join("") + monthArr.join("") + dayArr.join("") + (dowArr.join("")));
619622

623+
element.headerRows = 3;
624+
620625
break;
621626

622627
// **Months**
@@ -668,6 +673,8 @@
668673
dataPanel.append($('<div class="row"/>').html(dayArr.join("")));
669674
dataPanel.append($('<div class="row"/>').html(dowArr.join("")));
670675

676+
element.headerRows = 2;
677+
671678
break;
672679

673680
// **Days (default)**
@@ -746,9 +753,14 @@
746753
dataPanel.append($('<div class="row" style="margin-left: 0;" />').html(dayArr.join("")));
747754
dataPanel.append($('<div class="row" style="margin-left: 0;" />').html(dowArr.join("")));
748755

756+
element.headerRows = 4;
757+
749758
break;
750759
}
751760

761+
// update height of spacer element
762+
$leftPanel.find('.spacer').css("height", tools.getCellSize() * element.headerRows + "px")
763+
752764
return $('<div class="rightPanel"></div>').append(dataPanel);
753765
},
754766

@@ -1029,7 +1041,7 @@
10291041
// find row
10301042
var topEl = $(element).find("#rowheader" + i);
10311043

1032-
var top = tools.getCellSize() * 5 + 2 + parseInt(topEl.attr("offset"), 10);
1044+
var top = tools.getCellSize() * element.headerRows + 2 + parseInt(topEl.attr("offset"), 10);
10331045
_bar.css({ 'top': top, 'left': Math.floor(cFrom) });
10341046

10351047
datapanel.append(_bar);
@@ -1072,7 +1084,7 @@
10721084
// find row
10731085
var topEl = $(element).find("#rowheader" + i);
10741086

1075-
var top = tools.getCellSize() * 3 + 2 + parseInt(topEl.attr("offset"), 10);
1087+
var top = tools.getCellSize() * element.headerRows + 2 + parseInt(topEl.attr("offset"), 10);
10761088
_bar.css({ 'top': top, 'left': Math.floor(cFrom) });
10771089

10781090
datapanel.append(_bar);
@@ -1112,7 +1124,7 @@
11121124
// find row
11131125
var topEl = $(element).find("#rowheader" + i);
11141126

1115-
var top = tools.getCellSize() * 2 + 2 + parseInt(topEl.attr("offset"), 10);
1127+
var top = tools.getCellSize() * element.headerRows + 2 + parseInt(topEl.attr("offset"), 10);
11161128
_bar.css({ 'top': top, 'left': Math.floor(cFrom) });
11171129

11181130
datapanel.append(_bar);
@@ -1138,7 +1150,7 @@
11381150
// find row
11391151
var topEl = $(element).find("#rowheader" + i);
11401152

1141-
var top = tools.getCellSize() * 4 + 2 + parseInt(topEl.attr("offset"), 10);
1153+
var top = tools.getCellSize() * element.headerRows + 2 + parseInt(topEl.attr("offset"), 10);
11421154
_bar.css({ 'top': top, 'left': Math.floor(cFrom) });
11431155

11441156
datapanel.append(_bar);
@@ -1226,30 +1238,23 @@
12261238
var scaleSt = element.scaleStep + val * 3;
12271239
scaleSt = scaleSt <= 1 ? 1 : scaleSt === 4 ? 3 : scaleSt;
12281240
var scale = settings.scale;
1229-
var headerRows = element.headerRows;
12301241
if (settings.scale === "hours" && scaleSt >= 13) {
12311242
scale = "days";
1232-
headerRows = 4;
12331243
scaleSt = 13;
12341244
} else if (settings.scale === "days" && zoomIn) {
12351245
scale = "hours";
1236-
headerRows = 5;
12371246
scaleSt = 12;
12381247
} else if (settings.scale === "days" && !zoomIn) {
12391248
scale = "weeks";
1240-
headerRows = 3;
12411249
scaleSt = 13;
12421250
} else if (settings.scale === "weeks" && !zoomIn) {
12431251
scale = "months";
1244-
headerRows = 2;
12451252
scaleSt = 14;
12461253
} else if (settings.scale === "weeks" && zoomIn) {
12471254
scale = "days";
1248-
headerRows = 4;
12491255
scaleSt = 13;
12501256
} else if (settings.scale === "months" && zoomIn) {
12511257
scale = "weeks";
1252-
headerRows = 3;
12531258
scaleSt = 13;
12541259
}
12551260

@@ -1260,7 +1265,6 @@
12601265
}
12611266
element.scaleStep = scaleSt;
12621267
settings.scale = scale;
1263-
element.headerRows = headerRows;
12641268
var $rightPanel = $(element).find(".fn-gantt .rightPanel");
12651269
var $dataPanel = $rightPanel.find(".dataPanel");
12661270
element.hPosition = $dataPanel.css("margin-left").replace("px", "");
@@ -1730,11 +1734,11 @@
17301734
}
17311735

17321736
switch (settings.scale) {
1733-
//case "hours": this.headerRows = 5; this.scaleStep = 8; break;
1734-
case "hours": this.headerRows = 5; this.scaleStep = 1; break;
1735-
case "weeks": this.headerRows = 3; this.scaleStep = 13; break;
1736-
case "months": this.headerRows = 2; this.scaleStep = 14; break;
1737-
default: this.headerRows = 4; this.scaleStep = 13; break;
1737+
//case "hours": this.scaleStep = 8; break;
1738+
case "hours": this.scaleStep = 1; break;
1739+
case "weeks": this.scaleStep = 13; break;
1740+
case "months": this.scaleStep = 14; break;
1741+
default: this.scaleStep = 13; break;
17381742
}
17391743

17401744
this.scrollNavigation = {

0 commit comments

Comments
 (0)