Skip to content

Commit 400ff7c

Browse files
committed
fix(headers): Use value from given scale when generating headers.
Close angular-gantt#569
1 parent 339cc08 commit 400ff7c

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

assets/angular-gantt-dependencies-plugin.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/angular-gantt-plugins.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/angular-gantt.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/dist/scripts/vendor.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47326,7 +47326,7 @@ Github: https://github.com/angular-gantt/angular-gantt.git
4732647326
while (true) {
4732747327
var currentPosition = currentColumn.getPositionByDate(currentDate);
4732847328

47329-
var endDate = moment.min(moment(currentDate).add(1, viewScaleUnit), maximumDate);
47329+
var endDate = moment.min(moment(currentDate).add(viewScaleValue, viewScaleUnit), maximumDate);
4733047330

4733147331
var column = columnsManager.getColumnByDate(endDate, true);
4733247332

@@ -47594,11 +47594,11 @@ Github: https://github.com/angular-gantt/angular-gantt.git
4759447594

4759547595
// DEPRECATED
4759647596
var removedRows = [];
47597-
angular.forEach(oldData, function(removedRow) {
47598-
if (toRemoveIds.indexOf(removedRow.id) > -1) {
47599-
removedRows.push(removedRow);
47597+
for(i = 0, l = oldData.length; i < l; i++){
47598+
if (toRemoveIds.indexOf(oldData[i].id) > -1) {
47599+
removedRows.push(oldData[i]);
4760047600
}
47601-
});
47601+
}
4760247602
self.api.data.raise.remove(removedRows);
4760347603
}
4760447604
}
@@ -52579,10 +52579,10 @@ Github: https://github.com/angular-gantt/angular-gantt.git
5257952579
task.model.dependencies = taskDependencies;
5258052580
}
5258152581

52582-
angular.forEach(taskDependencies, function(taskDependency) {
52583-
var dependency = self.addDependency(task, taskDependency);
52582+
for(var i = 0, l = taskDependencies.length; i < l; i++){
52583+
var dependency = self.addDependency(task, taskDependencies[i]);
5258452584
dependency.connect();
52585-
});
52585+
}
5258652586
}
5258752587
}
5258852588
};

src/core/logic/column/headersGenerator.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
while (true) {
2929
var currentPosition = currentColumn.getPositionByDate(currentDate);
3030

31-
var endDate = moment.min(moment(currentDate).add(1, viewScaleUnit), maximumDate);
31+
var endDate = moment.min(moment(currentDate).add(viewScaleValue, viewScaleUnit), maximumDate);
3232

3333
var column = columnsManager.getColumnByDate(endDate, true);
3434

src/core/logic/gantt.factory.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@
185185

186186
// DEPRECATED
187187
var removedRows = [];
188-
angular.forEach(oldData, function(removedRow) {
189-
if (toRemoveIds.indexOf(removedRow.id) > -1) {
190-
removedRows.push(removedRow);
188+
for(i = 0, l = oldData.length; i < l; i++){
189+
if (toRemoveIds.indexOf(oldData[i].id) > -1) {
190+
removedRows.push(oldData[i]);
191191
}
192-
});
192+
}
193193
self.api.data.raise.remove(removedRows);
194194
}
195195
}

src/plugins/dependencies/dependenciesManager.factory.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
task.model.dependencies = taskDependencies;
5454
}
5555

56-
angular.forEach(taskDependencies, function(taskDependency) {
57-
var dependency = self.addDependency(task, taskDependency);
56+
for(var i = 0, l = taskDependencies.length; i < l; i++){
57+
var dependency = self.addDependency(task, taskDependencies[i]);
5858
dependency.connect();
59-
});
59+
}
6060
}
6161
}
6262
};

0 commit comments

Comments
 (0)