Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-04 23:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix JSHint errors

Browse Source
This commit is contained in:
etimberg
2015-10-20 20:33:51 -04:00
parent 351ccaf2f2
commit e46a2cb074
13 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/charts/Chart.Doughnut.js
View File

@@ -15,6 +15,6 @@
config.type = 'doughnut';
return new Chart(context, config);
}
};
}).call(this);

2
src/charts/Chart.Line.js
View File

@@ -9,6 +9,6 @@
config.type = 'line';
return new Chart(context, config);
}
};
}).call(this);

2
src/charts/Chart.PolarArea.js
View File

@@ -15,6 +15,6 @@
config.type = 'polarArea';
return new Chart(context, config);
}
};
}).call(this);

2
src/charts/Chart.Radar.js
View File

@@ -14,6 +14,6 @@
config.type = 'radar';
return new Chart(context, config);
}
};
}).call(this);

2
src/charts/Chart.Scatter.js
View File

@@ -34,6 +34,6 @@
config.options = helpers.configMerge(defaultConfig, config.options);
config.type = 'line';
return new Chart(context, config);
}
};
}).call(this);

2
src/controllers/controller.doughnut.js
View File

@@ -92,7 +92,7 @@
// Make sure that we handle number of datapoints changing
if (numData < numArcs) {
// Remove excess bars for data points that have been removed
this.getDataset().metaData.splice(numData, numArcs - numData)
this.getDataset().metaData.splice(numData, numArcs - numData);
} else if (numData > numArcs) {
// Add new elements
for (var index = numArcs; index < numData; ++index) {

10
src/controllers/controller.polarArea.js
View File

@@ -87,7 +87,7 @@
// Make sure that we handle number of datapoints changing
if (numData < numPoints) {
// Remove excess bars for data points that have been removed
this.getDataset().metaData.splice(numData, numPoints - numData)
this.getDataset().metaData.splice(numData, numPoints - numData);
} else if (numData > numPoints) {
// Add new elements
for (var index = numPoints; index < numData; ++index) {
@@ -206,12 +206,4 @@
},
});
return;
Chart.Type.extend({});
}).call(this);

2
src/controllers/controller.radar.js
View File

@@ -103,7 +103,7 @@
// Make sure that we handle number of datapoints changing
if (numData < numPoints) {
// Remove excess bars for data points that have been removed
this.getDataset().metaData.splice(numData, numPoints - numData)
this.getDataset().metaData.splice(numData, numPoints - numData);
} else if (numData > numPoints) {
// Add new elements
for (var index = numPoints; index < numData; ++index) {

12
src/core/core.controller.js
View File

@@ -158,7 +158,7 @@
this.scale = scale;
this.scales['radialScale'] = scale;
this.scales.radialScale = scale;
}
Chart.scaleService.update(this, this.chart.width, this.chart.height);
@@ -313,13 +313,13 @@
helpers.each(this.data.datasets, function(dataset, datasetIndex) {
if (helpers.isDatasetVisible(dataset)) {
for (var elementIndex = 0; elementIndex < dataset.metaData.length; elementIndex++) {
if (dataset.metaData[elementIndex].inLabelRange(eventPosition.x, eventPosition.y)) {
helpers.each(dataset.metaData, function(element, elementIndex) {
if (element.inLabelRange(eventPosition.x, eventPosition.y)) {
helpers.each(dataset.metaData, function(element, index) {
elementsArray.push(element);
}, this);
}
}
}, this);
}
}, this);
@@ -428,8 +428,8 @@
break;
case 'label':
case 'dataset':
for (var i = 0; i < this.active.length; i++) {
this.data.datasets[this.active[i]._datasetIndex].controller.setHoverStyle(this.active[i]);
for (var j = 0; j < this.active.length; j++) {
this.data.datasets[this.active[j]._datasetIndex].controller.setHoverStyle(this.active[j]);
}
break;
default:

8
src/core/core.helpers.js
View File

@@ -135,7 +135,7 @@
base[key].push(helpers.configMerge(valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj));
} else if (valueObj.type !== base[key][index].type) {
// Type changed. Bring in the new defaults before we bring in valueObj so that valueObj can override the correct scale defaults
base[key][index] = helpers.configMerge(base[key][index], valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj)
base[key][index] = helpers.configMerge(base[key][index], valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj);
} else {
// Type is the same
base[key][index] = helpers.configMerge(base[key][index], valueObj);
@@ -272,7 +272,7 @@
},
log10 = helpers.log10 = function(x) {
if (Math.log10) {
return Math.log10(x)
return Math.log10(x);
} else {
return Math.log(x) / Math.LN10;
}
@@ -837,7 +837,7 @@
// can use classlist
hiddenIframe.classlist.add(hiddenIframeClass);
} else {
hiddenIframe.setAttribute('class', hiddenIframeClass)
hiddenIframe.setAttribute('class', hiddenIframeClass);
}
// Set the style
@@ -860,7 +860,7 @@
if (callback) {
callback();
}
}
};
},
removeResizeListener = helpers.removeResizeListener = function(node) {
var hiddenIframe = node.querySelector('.chartjs-hidden-iframe');

2
src/core/core.scale.js
View File

@@ -112,7 +112,7 @@
// Reset position before calculating rotation
this.top = 0;
this.bottom = this.height
this.bottom = this.height;
}
// Reset padding

2
src/elements/element.arc.js
View File

@@ -45,7 +45,7 @@
// Put into the range of (-PI/2, 3PI/2]
var startAngle = vm.startAngle < (-0.5 * Math.PI) ? vm.startAngle + (2.0 * Math.PI) : vm.startAngle > (1.5 * Math.PI) ? vm.startAngle - (2.0 * Math.PI) : vm.startAngle;
var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle > (1.5 * Math.PI) ? vm.endAngle - (2.0 * Math.PI) : vm.endAngle
var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle > (1.5 * Math.PI) ? vm.endAngle - (2.0 * Math.PI) : vm.endAngle;
//Check if within the range of the open/close angle
var betweenAngles = (pointRelativePosition.angle >= startAngle && pointRelativePosition.angle <= endAngle),

12
src/scales/scale.category.js
View File

@@ -21,23 +21,23 @@
if (this.isHorizontal()) {
var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
var valueWidth = innerWidth / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
var valueOffset = (valueWidth * index) + this.paddingLeft;
var widthOffset = (valueWidth * index) + this.paddingLeft;
if (this.options.gridLines.offsetGridLines && includeOffset) {
valueOffset += (valueWidth / 2);
widthOffset += (valueWidth / 2);
}
return this.left + Math.round(valueOffset);
return this.left + Math.round(widthOffset);
} else {
var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
var valueHeight = innerHeight / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
var valueOffset = (valueHeight * index) + this.paddingTop;
var heightOffset = (valueHeight * index) + this.paddingTop;
if (this.options.gridLines.offsetGridLines && includeOffset) {
valueOffset += (valueHeight / 2);
heightOffset += (valueHeight / 2);
}
return this.top + Math.round(valueOffset);
return this.top + Math.round(heightOffset);
}
},
});