From 0de668b46f3f2e481fbdfdab1e607d3a01211f4a Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Sun, 27 Oct 2019 21:05:23 +0200 Subject: [PATCH] Fix line / non-numeric-y (#6617) --- 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 dc1fc689b..47adc0801 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 000000000..db5f3c381 --- /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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 literal 0 Hc-jL100001 -- 2.47.2