From: LAU <34402401+Lautarourtiaga@users.noreply.github.com> Date: Mon, 14 Sep 2020 13:57:50 +0000 (-0300) Subject: Better error message when importing charts incorrectly. (#7790) X-Git-Tag: v3.0.0-beta.2~1^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c20360d08a010bec31c7da86926fc0024b500bc2;p=thirdparty%2FChart.js.git Better error message when importing charts incorrectly. (#7790) * Created a better error message when chartjs can't find an element in the DOM. Also, prevented an exception when trying to find the canvas assuming is an array. When it could also be null. * Exception is not thrown anymore in getCanvas. Now this pr only prevents the item.lenght exception and logs a better error when a chart cant be created. * Deleted error description because i forgot chartjs is used in varois other ways than importing, also used isArray from helpers.core * isArray check deleted because the type of the dom element received in getCanvas could be not only an array. Co-authored-by: Lautaro Alonso Urtiaga --- diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 2a932062c..9ea1dce06 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -202,7 +202,7 @@ function isDomSupported() { function getCanvas(item) { if (isDomSupported() && typeof item === 'string') { item = document.getElementById(item); - } else if (item.length) { + } else if (item && item.length) { // Support for array based queries (such as jQuery) item = item[0]; }