From: Simon Brunel Date: Sat, 3 Sep 2016 15:49:58 +0000 (+0200) Subject: Enforce curly braces for single statement block X-Git-Tag: v2.3.0-rc.1~1^2~14^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3256%2Fhead;p=thirdparty%2FChart.js.git Enforce curly braces for single statement block curly: [error, all] (http://eslint.org/docs/rules/curly) --- diff --git a/.eslintrc b/.eslintrc index b02b49bfe..96eca84f5 100644 --- a/.eslintrc +++ b/.eslintrc @@ -46,7 +46,7 @@ rules: block-scoped-var: 0 complexity: [2, 6] consistent-return: 0 - curly: 0 + curly: [2, all] default-case: 0 dot-location: 0 dot-notation: 0 diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js index 1621274d3..30347a28d 100644 --- a/src/controllers/controller.bar.js +++ b/src/controllers/controller.bar.js @@ -405,8 +405,9 @@ module.exports = function(Chart) { // Find first (starting) corner with fallback to 'bottom' var borders = ['bottom', 'left', 'top', 'right']; var startCorner = borders.indexOf(vm.borderSkipped, 0); - if (startCorner === -1) + if (startCorner === -1) { startCorner = 0; + } function cornerAt(index) { return corners[(startCorner + index) % 4]; @@ -414,8 +415,9 @@ module.exports = function(Chart) { // Draw rectangle from 'startCorner' ctx.moveTo.apply(ctx, cornerAt(0)); - for (var i = 1; i < 4; i++) + for (var i = 1; i < 4; i++) { ctx.lineTo.apply(ctx, cornerAt(i)); + } ctx.fill(); if (vm.borderWidth) { diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js index 906cc8b91..53d3f38e6 100644 --- a/src/controllers/controller.line.js +++ b/src/controllers/controller.line.js @@ -250,20 +250,23 @@ module.exports = function(Chart) { var me = this; var meta = me.getMeta(); var area = me.chart.chartArea; - - // Only consider points that are drawn in case the spanGaps option is used var points = (meta.data || []); - if (meta.dataset._model.spanGaps) points = points.filter(function(pt) { return !pt._model.skip; }); var i, ilen, point, model, controlPoints; + // Only consider points that are drawn in case the spanGaps option is used + if (meta.dataset._model.spanGaps) { + points = points.filter(function(pt) { + return !pt._model.skip; + }); + } + function capControlPoint(pt, min, max) { return Math.max(Math.min(pt, max), min); } if (meta.dataset._model.cubicInterpolationMode === 'monotone') { helpers.splineCurveMonotone(points); - } - else { + } else { for (i = 0, ilen = points.length; i < ilen; ++i) { point = points[i]; model = point._model; @@ -289,7 +292,6 @@ module.exports = function(Chart) { model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom); } } - }, draw: function(ease) { diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js index 0cf16f171..2c69adcd5 100644 --- a/src/core/core.helpers.js +++ b/src/core/core.helpers.js @@ -358,16 +358,25 @@ module.exports = function(Chart) { var i, pointBefore, pointCurrent, pointAfter; for (i = 0; i < pointsLen; ++i) { pointCurrent = pointsWithTangents[i]; - if (pointCurrent.model.skip) continue; + if (pointCurrent.model.skip) { + continue; + } + pointBefore = i > 0 ? pointsWithTangents[i - 1] : null; pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null; if (pointAfter && !pointAfter.model.skip) { pointCurrent.deltaK = (pointAfter.model.y - pointCurrent.model.y) / (pointAfter.model.x - pointCurrent.model.x); } - if (!pointBefore || pointBefore.model.skip) pointCurrent.mK = pointCurrent.deltaK; - else if (!pointAfter || pointAfter.model.skip) pointCurrent.mK = pointBefore.deltaK; - else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) pointCurrent.mK = 0; - else pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2; + + if (!pointBefore || pointBefore.model.skip) { + pointCurrent.mK = pointCurrent.deltaK; + } else if (!pointAfter || pointAfter.model.skip) { + pointCurrent.mK = pointBefore.deltaK; + } else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) { + pointCurrent.mK = 0; + } else { + pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2; + } } // Adjust tangents to ensure monotonic properties @@ -375,15 +384,22 @@ module.exports = function(Chart) { for (i = 0; i < pointsLen - 1; ++i) { pointCurrent = pointsWithTangents[i]; pointAfter = pointsWithTangents[i + 1]; - if (pointCurrent.model.skip || pointAfter.model.skip) continue; + if (pointCurrent.model.skip || pointAfter.model.skip) { + continue; + } + if (helpers.almostEquals(pointCurrent.deltaK, 0, this.EPSILON)) { pointCurrent.mK = pointAfter.mK = 0; continue; } + alphaK = pointCurrent.mK / pointCurrent.deltaK; betaK = pointAfter.mK / pointCurrent.deltaK; squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2); - if (squaredMagnitude <= 9) continue; + if (squaredMagnitude <= 9) { + continue; + } + tauK = 3 / Math.sqrt(squaredMagnitude); pointCurrent.mK = alphaK * tauK * pointCurrent.deltaK; pointAfter.mK = betaK * tauK * pointCurrent.deltaK; @@ -393,7 +409,10 @@ module.exports = function(Chart) { var deltaX; for (i = 0; i < pointsLen; ++i) { pointCurrent = pointsWithTangents[i]; - if (pointCurrent.model.skip) continue; + if (pointCurrent.model.skip) { + continue; + } + pointBefore = i > 0 ? pointsWithTangents[i - 1] : null; pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null; if (pointBefore && !pointBefore.model.skip) { @@ -412,7 +431,6 @@ module.exports = function(Chart) { if (loop) { return index >= collection.length - 1 ? collection[0] : collection[index + 1]; } - return index >= collection.length - 1 ? collection[collection.length - 1] : collection[index + 1]; }; helpers.previousItem = function(collection, index, loop) { diff --git a/src/core/core.legend.js b/src/core/core.legend.js index fe5b47f80..8d3ce3c09 100644 --- a/src/core/core.legend.js +++ b/src/core/core.legend.js @@ -341,11 +341,9 @@ module.exports = function(Chart) { // Draw pointStyle as legend symbol Chart.canvasHelpers.drawPoint(ctx, legendItem.pointStyle, radius, centerX, centerY); - } - else { + } else { // Draw box as legend symbol - if (!isLineWidthZero) - { + if (!isLineWidthZero) { ctx.strokeRect(x, y, boxWidth, fontSize); } ctx.fillRect(x, y, boxWidth, fontSize); diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js index 6bedca755..dd252a76c 100644 --- a/src/elements/element.rectangle.js +++ b/src/elements/element.rectangle.js @@ -48,8 +48,9 @@ module.exports = function(Chart) { // Find first (starting) corner with fallback to 'bottom' var borders = ['bottom', 'left', 'top', 'right']; var startCorner = borders.indexOf(vm.borderSkipped, 0); - if (startCorner === -1) + if (startCorner === -1) { startCorner = 0; + } function cornerAt(index) { return corners[(startCorner + index) % 4]; @@ -57,8 +58,9 @@ module.exports = function(Chart) { // Draw rectangle from 'startCorner' ctx.moveTo.apply(ctx, cornerAt(0)); - for (var i = 1; i < 4; i++) + for (var i = 1; i < 4; i++) { ctx.lineTo.apply(ctx, cornerAt(i)); + } ctx.fill(); if (vm.borderWidth) {