Skip to content

Commit 1a01415

Browse files
committed
CR fixes: variable declaration, conditional and logic control formatting
1 parent f9692c2 commit 1a01415

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

src/controllers/controller.doughnut.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ defaults._set('doughnut', {
2020
},
2121
legendCallback: function(chart) {
2222
var list = document.createElement('ul');
23-
list.setAttribute('class', chart.id + '-legend');
24-
2523
var data = chart.data;
2624
var datasets = data.datasets;
2725
var labels = data.labels;
2826

29-
if (datasets.length) {
30-
for (var i = 0; i < datasets[0].data.length; ++i) {
31-
var listItem = list.appendChild(document.createElement('li'));
32-
var listItemSpan = listItem.appendChild(document.createElement('span'));
33-
listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
34-
if (labels[i]) {
35-
listItem.appendChild(document.createTextNode(labels[i]));
36-
}
27+
var i, ilen, listItem, listItemSpan;
28+
29+
list.setAttribute('class', chart.id + '-legend');
30+
31+
for (i = 0, ilen = datasets[0].data.length || 0; i < ilen; ++i) {
32+
listItem = list.appendChild(document.createElement('li'));
33+
listItemSpan = listItem.appendChild(document.createElement('span'));
34+
listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
35+
if (labels[i]) {
36+
listItem.appendChild(document.createTextNode(labels[i]));
3737
}
3838
}
3939

src/controllers/controller.polarArea.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ defaults._set('polarArea', {
3333
startAngle: -0.5 * Math.PI,
3434
legendCallback: function(chart) {
3535
var list = document.createElement('ul');
36-
list.setAttribute('class', chart.id + '-legend');
37-
3836
var data = chart.data;
3937
var datasets = data.datasets;
4038
var labels = data.labels;
4139

42-
if (datasets.length) {
43-
for (var i = 0; i < datasets[0].data.length; ++i) {
44-
var listItem = list.appendChild(document.createElement('li'));
45-
var listItemSpan = listItem.appendChild(document.createElement('span'));
46-
listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
47-
if (labels[i]) {
48-
listItem.appendChild(document.createTextNode(labels[i]));
49-
}
40+
var i, ilen, listItem, listItemSpan;
41+
42+
list.setAttribute('class', chart.id + '-legend');
43+
44+
for (i = 0, ilen = datasets[0].data.length || 0; i < ilen; ++i) {
45+
listItem = list.appendChild(document.createElement('li'));
46+
listItemSpan = listItem.appendChild(document.createElement('span'));
47+
listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
48+
if (labels[i]) {
49+
listItem.appendChild(document.createTextNode(labels[i]));
5050
}
5151
}
5252

src/plugins/plugin.legend.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ defaults._set('global', {
7272

7373
legendCallback: function(chart) {
7474
var list = document.createElement('ul');
75+
var i, ilen, listItem, listItemSpan;
76+
7577
list.setAttribute('class', chart.id + '-legend');
7678

77-
if (datasets.length) {
78-
for (var i = 0; i < chart.data.datasets.length; i++) {
79-
var listItem = list.appendChild(document.createElement('li'));
80-
var listItemSpan = listItem.appendChild(document.createElement('span'));
81-
listItemSpan.style.backgroundColor = chart.data.datasets[i].backgroundColor;
82-
if (chart.data.datasets[i].label) {
83-
listItem.appendChild(document.createTextNode(chart.data.datasets[i].label));
84-
}
79+
for (i = 0, ilen = chart.data.datasets.length || 0; i < ilen; i++) {
80+
listItem = list.appendChild(document.createElement('li'));
81+
listItemSpan = listItem.appendChild(document.createElement('span'));
82+
listItemSpan.style.backgroundColor = chart.data.datasets[i].backgroundColor;
83+
if (chart.data.datasets[i].label) {
84+
listItem.appendChild(document.createTextNode(chart.data.datasets[i].label));
8585
}
8686
}
8787

0 commit comments

Comments
 (0)