From f36123925c4e3c343c8b64e1f2a73a0d6a489a8c Mon Sep 17 00:00:00 2001 From: Simon Brunel Date: Sat, 18 Jun 2016 11:00:11 +0200 Subject: [PATCH] Fix #2734 Cleanup unused variables --- config.jshintrc | 1 + src/charts/Chart.Scatter.js | 4 ++-- src/controllers/controller.bar.js | 2 +- src/controllers/controller.bubble.js | 2 +- src/controllers/controller.doughnut.js | 2 -- src/controllers/controller.line.js | 5 ++--- src/controllers/controller.polarArea.js | 2 -- src/controllers/controller.radar.js | 2 +- src/core/core.controller.js | 4 ++-- src/core/core.datasetController.js | 4 +--- src/core/core.layoutService.js | 2 -- src/core/core.legend.js | 12 +++++------- src/core/core.scale.js | 17 ++++++----------- src/core/core.title.js | 2 -- src/core/core.tooltip.js | 4 ++-- src/elements/element.arc.js | 2 +- src/elements/element.rectangle.js | 9 ++++----- src/scales/scale.category.js | 6 +++--- src/scales/scale.linear.js | 11 +++++------ src/scales/scale.linearbase.js | 4 +--- src/scales/scale.logarithmic.js | 10 ++++------ src/scales/scale.radialLinear.js | 3 +-- src/scales/scale.time.js | 14 ++++++-------- 23 files changed, 49 insertions(+), 75 deletions(-) diff --git a/config.jshintrc b/config.jshintrc index 978cc985a..00b42024f 100644 --- a/config.jshintrc +++ b/config.jshintrc @@ -1,4 +1,5 @@ { "node": true, + "unused": true, "predef": [ "require", "module" ] } \ No newline at end of file diff --git a/src/charts/Chart.Scatter.js b/src/charts/Chart.Scatter.js index 7b5045357..7ab5c5717 100644 --- a/src/charts/Chart.Scatter.js +++ b/src/charts/Chart.Scatter.js @@ -22,11 +22,11 @@ module.exports = function(Chart) { tooltips: { callbacks: { - title: function(tooltipItems, data) { + title: function() { // Title doesn't make sense for scatter since we format the data as a point return ''; }, - label: function(tooltipItem, data) { + label: function(tooltipItem) { return '(' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ')'; } } diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js index 28962db98..509ff1b2a 100644 --- a/src/controllers/controller.bar.js +++ b/src/controllers/controller.bar.js @@ -338,7 +338,7 @@ module.exports = function(Chart) { }; Chart.controllers.horizontalBar = Chart.controllers.bar.extend({ - updateElement: function updateElement(rectangle, index, reset, numBars) { + updateElement: function updateElement(rectangle, index, reset) { var me = this; var meta = me.getMeta(); var xScale = me.getScaleForId(meta.xAxisID); diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js index 8dd9cf86e..ee717a3dc 100644 --- a/src/controllers/controller.bubble.js +++ b/src/controllers/controller.bubble.js @@ -24,7 +24,7 @@ module.exports = function(Chart) { tooltips: { callbacks: { - title: function(tooltipItems, data) { + title: function() { // Title doesn't make sense for scatter since we format the data as a point return ''; }, diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js index ddc1b9af4..c039532b4 100644 --- a/src/controllers/controller.doughnut.js +++ b/src/controllers/controller.doughnut.js @@ -189,7 +189,6 @@ module.exports = function(Chart) { chartArea = chart.chartArea, opts = chart.options, animationOpts = opts.animation, - arcOpts = opts.elements.arc, centerX = (chartArea.left + chartArea.right) / 2, centerY = (chartArea.top + chartArea.bottom) / 2, startAngle = opts.rotation, // non reset case handled later @@ -198,7 +197,6 @@ module.exports = function(Chart) { circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(dataset.data[index]) * (opts.circumference / (2.0 * Math.PI)), innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius, outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius, - custom = arc.custom || {}, valueAtIndexOrDefault = helpers.getValueAtIndexOrDefault; helpers.extend(arc, { diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js index a0138eed2..b5c31e161 100644 --- a/src/controllers/controller.line.js +++ b/src/controllers/controller.line.js @@ -181,7 +181,7 @@ module.exports = function(Chart) { } x = xScale.getPixelForValue(value, index, datasetIndex, me.chart.isCombo); - y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex, me.chart.isCombo); + y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex); // Utility point._xScale = xScale; @@ -206,7 +206,7 @@ module.exports = function(Chart) { }; }, - calculatePointY: function(value, index, datasetIndex, isCombo) { + calculatePointY: function(value, index, datasetIndex) { var me = this; var chart = me.chart; var meta = me.getMeta(); @@ -240,7 +240,6 @@ module.exports = function(Chart) { updateBezierControlPoints: function() { var meta = this.getMeta(); - var area = this.chart.chartArea; var points = meta.data || []; var i, ilen, point, model, controlPoints; diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js index ebf88b5ea..23d0f4e19 100644 --- a/src/controllers/controller.polarArea.js +++ b/src/controllers/controller.polarArea.js @@ -134,8 +134,6 @@ module.exports = function(Chart) { var dataset = me.getDataset(); var opts = chart.options; var animationOpts = opts.animation; - var arcOpts = opts.elements.arc; - var custom = arc.custom || {}; var scale = chart.scale; var getValueAtIndexOrDefault = helpers.getValueAtIndexOrDefault; var labels = chart.data.labels; diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js index 102c3744a..4634add43 100644 --- a/src/controllers/controller.radar.js +++ b/src/controllers/controller.radar.js @@ -146,7 +146,7 @@ module.exports = function(Chart) { var easingDecimal = ease || 1; // Transition Point Locations - helpers.each(meta.data, function(point, index) { + helpers.each(meta.data, function(point) { point.transition(easingDecimal); }); diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 2d0148b77..9b6693900 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -154,7 +154,7 @@ module.exports = function(Chart) { items.push({ options: options.scale, dtype: 'radialLinear', isDefault: true }); } - helpers.each(items, function(item, index) { + helpers.each(items, function(item) { var scaleOptions = item.options; var scaleType = helpers.getValueOrDefault(scaleOptions.type, item.dtype); var scaleClass = Chart.scaleService.getScaleConstructor(scaleType); @@ -375,7 +375,7 @@ module.exports = function(Chart) { helpers.each(me.data.datasets, function(dataset, datasetIndex) { if (me.isDatasetVisible(datasetIndex)) { var meta = me.getDatasetMeta(datasetIndex); - helpers.each(meta.data, function(element, index) { + helpers.each(meta.data, function(element) { if (element.inRange(eventPosition.x, eventPosition.y)) { elementsArray.push(element); return elementsArray; diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js index 07f787eaf..7ef414f7d 100644 --- a/src/core/core.datasetController.js +++ b/src/core/core.datasetController.js @@ -128,7 +128,7 @@ module.exports = function(Chart) { draw: function(ease) { var easingDecimal = ease || 1; - helpers.each(this.getMeta().data, function(element, index) { + helpers.each(this.getMeta().data, function(element) { element.transition(easingDecimal).draw(); }); }, @@ -138,7 +138,6 @@ module.exports = function(Chart) { index = element._index, custom = element.custom || {}, valueOrDefault = helpers.getValueAtIndexOrDefault, - color = helpers.color, model = element._model; model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor); @@ -151,7 +150,6 @@ module.exports = function(Chart) { index = element._index, custom = element.custom || {}, valueOrDefault = helpers.getValueAtIndexOrDefault, - color = helpers.color, getHoverColor = helpers.getHoverColor, model = element._model; diff --git a/src/core/core.layoutService.js b/src/core/core.layoutService.js index 700ecfd53..6e649b13a 100644 --- a/src/core/core.layoutService.js +++ b/src/core/core.layoutService.js @@ -267,8 +267,6 @@ module.exports = function(Chart) { // Step 7 - Position the boxes var left = xPadding; var top = yPadding; - var right = 0; - var bottom = 0; helpers.each(leftBoxes.concat(topBoxes), placeBox); diff --git a/src/core/core.legend.js b/src/core/core.legend.js index 78c89c559..4747bbad5 100644 --- a/src/core/core.legend.js +++ b/src/core/core.legend.js @@ -274,11 +274,10 @@ module.exports = function(Chart) { var me = this; var opts = me.options; var labelOpts = opts.labels; - var globalDefault = Chart.defaults.global, - lineDefault = globalDefault.elements.line, - legendWidth = me.width, - legendHeight = me.height, - lineWidths = me.lineWidths; + var globalDefault = Chart.defaults.global; + var lineDefault = globalDefault.elements.line; + var legendWidth = me.width; + var lineWidths = me.lineWidths; if (opts.display) { var ctx = me.ctx, @@ -373,7 +372,6 @@ module.exports = function(Chart) { cursor.line++; } } - drawLegendBox(x, y, legendItem); @@ -388,7 +386,7 @@ module.exports = function(Chart) { } else { cursor.y += itemHeight; } - + }); } }, diff --git a/src/core/core.scale.js b/src/core/core.scale.js index 93f074913..698d2fb5b 100644 --- a/src/core/core.scale.js +++ b/src/core/core.scale.js @@ -284,9 +284,6 @@ module.exports = function(Chart) { var tickLabelFont = helpers.fontString(tickFontSize, tickFontStyle, tickFontFamily); var scaleLabelFontSize = helpers.getValueOrDefault(scaleLabelOpts.fontSize, globalDefaults.defaultFontSize); - var scaleLabelFontStyle = helpers.getValueOrDefault(scaleLabelOpts.fontStyle, globalDefaults.defaultFontStyle); - var scaleLabelFontFamily = helpers.getValueOrDefault(scaleLabelOpts.fontFamily, globalDefaults.defaultFontFamily); - var scaleLabelFont = helpers.fontString(scaleLabelFontSize, scaleLabelFontStyle, scaleLabelFontFamily); var tickMarkLength = opts.gridLines.tickMarkLength; @@ -514,9 +511,7 @@ module.exports = function(Chart) { var labelRotationRadians = helpers.toRadians(me.labelRotation); var cosRotation = Math.cos(labelRotationRadians); - var sinRotation = Math.sin(labelRotationRadians); var longestRotatedLabel = me.longestLabelWidth * cosRotation; - var rotatedLabelHeight = tickFontSize * sinRotation; // Make sure we draw text in the correct color and font context.fillStyle = tickFontColor; @@ -526,11 +521,11 @@ module.exports = function(Chart) { if (isHorizontal) { skipRatio = false; - // Only calculate the skip ratio with the half width of longestRotateLabel if we got an actual rotation - // See #2584 - if (isRotated) { - longestRotatedLabel /= 2; - } + // Only calculate the skip ratio with the half width of longestRotateLabel if we got an actual rotation + // See #2584 + if (isRotated) { + longestRotatedLabel /= 2; + } if ((longestRotatedLabel + optionTicks.autoSkipPadding) * me.ticks.length > (me.width - (me.paddingLeft + me.paddingRight))) { skipRatio = 1 + Math.floor(((longestRotatedLabel + optionTicks.autoSkipPadding) * me.ticks.length) / (me.width - (me.paddingLeft + me.paddingRight))); @@ -712,7 +707,7 @@ module.exports = function(Chart) { scaleLabelY = me.top + ((me.bottom - me.top) / 2); rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI; } - + context.save(); context.translate(scaleLabelX, scaleLabelY); context.rotate(rotation); diff --git a/src/core/core.title.js b/src/core/core.title.js index 4e00b82b7..25abad2a7 100644 --- a/src/core/core.title.js +++ b/src/core/core.title.js @@ -111,9 +111,7 @@ module.exports = function(Chart) { beforeFit: noop, fit: function() { - var me = this, - ctx = me.ctx, valueOrDefault = helpers.getValueOrDefault, opts = me.options, globalDefaults = Chart.defaults.global, diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js index d55dd2be0..bff3f2962 100755 --- a/src/core/core.tooltip.js +++ b/src/core/core.tooltip.js @@ -498,7 +498,7 @@ module.exports = function(Chart) { return pt; }, - drawCaret: function drawCaret(tooltipPoint, size, opacity, caretPadding) { + drawCaret: function drawCaret(tooltipPoint, size, opacity) { var vm = this._view; var ctx = this._chart.ctx; var x1, x2, x3; @@ -692,7 +692,7 @@ module.exports = function(Chart) { ctx.fill(); // Draw Caret - this.drawCaret(pt, tooltipSize, opacity, vm.caretPadding); + this.drawCaret(pt, tooltipSize, opacity); // Draw Title, Body, and Footer pt.x += vm.xPadding; diff --git a/src/elements/element.arc.js b/src/elements/element.arc.js index 7b6d96a81..e91b9c2c8 100644 --- a/src/elements/element.arc.js +++ b/src/elements/element.arc.js @@ -1,6 +1,6 @@ "use strict"; -module.exports = function(Chart, moment) { +module.exports = function(Chart) { var helpers = Chart.helpers, globalOpts = Chart.defaults.global; diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js index 944d5e38a..6bedca755 100644 --- a/src/elements/element.rectangle.js +++ b/src/elements/element.rectangle.js @@ -2,8 +2,7 @@ module.exports = function(Chart) { - var helpers = Chart.helpers, - globalOpts = Chart.defaults.global; + var globalOpts = Chart.defaults.global; globalOpts.elements.rectangle = { backgroundColor: globalOpts.defaultColor, @@ -46,7 +45,7 @@ module.exports = function(Chart) { [rightX, vm.base] ]; - // Find first (starting) corner with fallback to 'bottom' + // Find first (starting) corner with fallback to 'bottom' var borders = ['bottom', 'left', 'top', 'right']; var startCorner = borders.indexOf(vm.borderSkipped, 0); if (startCorner === -1) @@ -72,8 +71,8 @@ module.exports = function(Chart) { }, inRange: function(mouseX, mouseY) { var vm = this._view; - return vm ? - (vm.y < vm.base ? + return vm ? + (vm.y < vm.base ? (mouseX >= vm.x - vm.width / 2 && mouseX <= vm.x + vm.width / 2) && (mouseY >= vm.y && mouseY <= vm.base) : (mouseX >= vm.x - vm.width / 2 && mouseX <= vm.x + vm.width / 2) && (mouseY >= vm.base && mouseY <= vm.y)) : false; diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js index efbcbcce6..fc1d69eb6 100644 --- a/src/scales/scale.category.js +++ b/src/scales/scale.category.js @@ -9,7 +9,7 @@ module.exports = function(Chart) { }; var DatasetScale = Chart.Scale.extend({ - // Implement this so that + // Implement this so that determineDataLimits: function() { var me = this; me.minIndex = 0; @@ -32,13 +32,13 @@ module.exports = function(Chart) { me.max = me.chart.data.labels[me.maxIndex]; }, - buildTicks: function(index) { + buildTicks: function() { var me = this; // If we are viewing some subset of labels, slice the original array me.ticks = (me.minIndex === 0 && me.maxIndex === me.chart.data.labels.length - 1) ? me.chart.data.labels : me.chart.data.labels.slice(me.minIndex, me.maxIndex + 1); }, - getLabelForIndex: function(index, datasetIndex) { + getLabelForIndex: function(index) { return this.ticks[index]; }, diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js index 31630c284..2c19f71a7 100644 --- a/src/scales/scale.linear.js +++ b/src/scales/scale.linear.js @@ -39,7 +39,6 @@ module.exports = function(Chart) { determineDataLimits: function() { var me = this; var opts = me.options; - var tickOpts = opts.ticks; var chart = me.chart; var data = chart.data; var datasets = data.datasets; @@ -148,7 +147,7 @@ module.exports = function(Chart) { return maxTicks; }, - // Called after the ticks are built. We need + // Called after the ticks are built. We need handleDirectionalChanges: function() { if (!this.isHorizontal()) { // We are in a vertical orientation. The top value is the highest. So reverse the array @@ -159,9 +158,9 @@ module.exports = function(Chart) { return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]); }, // Utils - getPixelForValue: function(value, index, datasetIndex, includeOffset) { + getPixelForValue: function(value) { // This must be called after fit has been run so that - // this.left, this.top, this.right, and this.bottom have been defined + // this.left, this.top, this.right, and this.bottom have been defined var me = this; var paddingLeft = me.paddingLeft; var paddingBottom = me.paddingBottom; @@ -191,8 +190,8 @@ module.exports = function(Chart) { var offset = (isHorizontal ? pixel - me.left - paddingLeft : me.bottom - paddingBottom - pixel) / innerDimension; return me.start + ((me.end - me.start) * offset); }, - getPixelForTick: function(index, includeOffset) { - return this.getPixelForValue(this.ticksAsNumbers[index], null, null, includeOffset); + getPixelForTick: function(index) { + return this.getPixelForValue(this.ticksAsNumbers[index]); } }); Chart.scaleService.registerScaleType("linear", LinearScale, defaultConfig); diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js index 45292b812..53beb4d06 100644 --- a/src/scales/scale.linearbase.js +++ b/src/scales/scale.linearbase.js @@ -53,11 +53,9 @@ module.exports = function(Chart) { buildTicks: function() { var me = this; var opts = me.options; + var ticks = me.ticks = []; var tickOpts = opts.ticks; var getValueOrDefault = helpers.getValueOrDefault; - var isHorizontal = me.isHorizontal(); - - var ticks = me.ticks = []; // Figure out what the max number of ticks we can support it is based on the size of // the axis area. For now, we say that the minimum tick spacing in pixels must be 50 diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js index 3d5bddc3b..9c595b0ac 100644 --- a/src/scales/scale.logarithmic.js +++ b/src/scales/scale.logarithmic.js @@ -177,10 +177,10 @@ module.exports = function(Chart) { getLabelForIndex: function(index, datasetIndex) { return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]); }, - getPixelForTick: function(index, includeOffset) { - return this.getPixelForValue(this.tickValues[index], null, null, includeOffset); + getPixelForTick: function(index) { + return this.getPixelForValue(this.tickValues[index]); }, - getPixelForValue: function(value, index, datasetIndex, includeOffset) { + getPixelForValue: function(value) { var me = this; var innerDimension; var pixel; @@ -215,10 +215,8 @@ module.exports = function(Chart) { }, getValueForPixel: function(pixel) { var me = this; - var offset; var range = helpers.log10(me.end) - helpers.log10(me.start); - var value; - var innerDimension; + var value, innerDimension; if (me.isHorizontal()) { innerDimension = me.width - (me.paddingLeft + me.paddingRight); diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 241069e10..c69974f60 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -164,8 +164,7 @@ module.exports = function(Chart) { xProtrusionLeft, xProtrusionRight, radiusReductionRight, - radiusReductionLeft, - maxWidthRadius; + radiusReductionLeft; this.ctx.font = pointLabeFont; for (i = 0; i < this.getValueCount(); i++) { diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 1c2ef44b9..0adbbf111 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -94,7 +94,7 @@ module.exports = function(Chart) { // these var scaleLabelMoments = []; if (me.chart.data.labels && me.chart.data.labels.length > 0) { - helpers.each(me.chart.data.labels, function(label, index) { + helpers.each(me.chart.data.labels, function(label) { var labelMoment = me.parseTime(label); if (labelMoment.isValid()) { @@ -117,7 +117,7 @@ module.exports = function(Chart) { var datasetVisible = me.chart.isDatasetVisible(datasetIndex); if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) { - helpers.each(dataset.data, function(value, index) { + helpers.each(dataset.data, function(value) { var labelMoment = me.parseTime(me.getRightValue(value)); if (labelMoment.isValid()) { @@ -154,7 +154,7 @@ module.exports = function(Chart) { me.firstTick = (me.firstTick || moment()).clone(); me.lastTick = (me.lastTick || moment()).clone(); }, - buildTicks: function(index) { + buildTicks: function() { var me = this; me.ctx.save(); @@ -325,7 +325,7 @@ module.exports = function(Chart) { me.tickMoments = me.ticks; me.ticks = me.ticks.map(me.tickFormatFunction, me); }, - getPixelForValue: function(value, index, datasetIndex, includeOffset) { + getPixelForValue: function(value, index, datasetIndex) { var me = this; var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index); @@ -336,21 +336,19 @@ module.exports = function(Chart) { if (me.isHorizontal()) { var innerWidth = me.width - (me.paddingLeft + me.paddingRight); - var valueWidth = innerWidth / Math.max(me.ticks.length - 1, 1); var valueOffset = (innerWidth * decimal) + me.paddingLeft; return me.left + Math.round(valueOffset); } else { var innerHeight = me.height - (me.paddingTop + me.paddingBottom); - var valueHeight = innerHeight / Math.max(me.ticks.length - 1, 1); var heightOffset = (innerHeight * decimal) + me.paddingTop; return me.top + Math.round(heightOffset); } } }, - getPixelForTick: function(index, includeOffset) { - return this.getPixelForValue(this.tickMoments[index], null, null, includeOffset); + getPixelForTick: function(index) { + return this.getPixelForValue(this.tickMoments[index], null, null); }, getValueForPixel: function(pixel) { var me = this; -- 2.47.3