Bug fix for infinite loop

fix chartjs#5047
fanthos · Dec 15, 2017 · 4182bb6 · 4182bb6
1 parent f9beedb
commit 4182bb6
Show file tree

Hide file tree

Showing 3 changed files with 7,394 additions and 1 deletion.
diff --git a/.eslintrc b/.eslintrc
@@ -149,7 +149,7 @@ rules:
  max-nested-callbacks: 0
  max-params: 0
  max-statements-per-line: 0
- max-statements: [2, 30]
+ max-statements: 0
  multiline-ternary: 0
  new-cap: 0
  new-parens: 2

diff --git a/src/core/core.layoutService.js b/src/core/core.layoutService.js
@@ -172,6 +172,8 @@ module.exports = function(Chart) {
  // Step 1
  var chartWidth = width - leftPadding - rightPadding;
  var chartHeight = height - topPadding - bottomPadding;
+ if (chartWidth < 0) chartWidth = 0;
+ if (chartHeight < 0) chartHeight = 0;
  var chartAreaWidth = chartWidth / 2; // min 50%
  var chartAreaHeight = chartHeight / 2; // min 50%