From 0499310fff5fe914bc745f6e782e720e438a9a28 Mon Sep 17 00:00:00 2001 From: kurkle Date: Sun, 27 Oct 2019 20:40:29 +0200 Subject: [PATCH] Fix line / non-numeric-y --- src/controllers/controller.line.js | 3 +- .../controller.line/non-numeric-y.json | 34 ++++++++++++++++++ .../controller.line/non-numeric-y.png | Bin 0 -> 3702 bytes 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/controller.line/non-numeric-y.json create mode 100644 test/fixtures/controller.line/non-numeric-y.png diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js index dc1fc689b24..47adc08010c 100644 --- a/src/controllers/controller.line.js +++ b/src/controllers/controller.line.js @@ -209,8 +209,9 @@ module.exports = DatasetController.extend({ if (rightValue < 0) { return yScale.getPixelForValue(sumNeg + rightValue); } + return yScale.getPixelForValue(sumPos + rightValue); } - return yScale.getPixelForValue(sumPos + rightValue); + return yScale.getPixelForValue(value); }, updateBezierControlPoints: function() { diff --git a/test/fixtures/controller.line/non-numeric-y.json b/test/fixtures/controller.line/non-numeric-y.json new file mode 100644 index 00000000000..db5f3c38180 --- /dev/null +++ b/test/fixtures/controller.line/non-numeric-y.json @@ -0,0 +1,34 @@ +{ + "config": { + "type": "line", + "data": { + "xLabels": ["January", "February", "March", "April", "May", "June", "July"], + "yLabels": ["", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed"], + "datasets": [{ + "label": "My First dataset", + "data": ["", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed"], + "fill": false, + "borderColor": "red", + "backgroundColor": "red" + }] + }, + "options": { + "responsive": false, + "legend": false, + "title": false, + "scales": { + "xAxes": [{"display": false}], + "yAxes": [{ + "type": "category", + "display": false + }] + } + } + }, + "options": { + "canvas": { + "height": 256, + "width": 512 + } + } +} diff --git a/test/fixtures/controller.line/non-numeric-y.png b/test/fixtures/controller.line/non-numeric-y.png new file mode 100644 index 0000000000000000000000000000000000000000..5ebecd597b5c127faf76dae0837ed9a3a4eae94d GIT binary patch literal 3702 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 C8m6xR literal 0 HcmV?d00001