| @@ -18,13 +18,8 @@ | ||
| 18 | 18 | |
| 19 | 19 | if(chart.library !== 'chartjs'){ |
| 20 | 20 | return; |
| 21 | 21 | } |
| 22 | - | |
| 23 | - // Bail if the chart is already rendered or is being rendered. | |
| 24 | - if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) { | |
| 25 | - return; | |
| 26 | - } | |
| 27 | 22 | rendered_charts[id] = 'yes'; |
| 28 | 23 | |
| 29 | 24 | series = chart.series; |
| 30 | 25 | data = chart.data; |
| @@ -152,10 +147,8 @@ | ||
| 152 | 147 | } |
| 153 | 148 | } |
| 154 | 149 | }; |
| 155 | 150 | |
| 156 | - override(settings, chart); | |
| 157 | - | |
| 158 | 151 | var chartjs = new Chart(context, { |
| 159 | 152 | type: type, |
| 160 | 153 | data: { |
| 161 | 154 | labels: labels, |
| @@ -205,8 +198,12 @@ | ||
| 205 | 198 | if(typeof settings['animation'] !== 'undefined' && parseInt(settings['animation']['duration']) === 0){ |
| 206 | 199 | settings['animation']['duration'] = 1000; |
| 207 | 200 | } |
| 208 | 201 | |
| 202 | + if(typeof settings['title'] !== 'undefined' && settings['title']['text'] !== ''){ | |
| 203 | + settings['title']['display'] = true; | |
| 204 | + } | |
| 205 | + | |
| 209 | 206 | if(typeof settings['tooltip'] !== 'undefined' && typeof settings['tooltip']['intersect'] !== 'undefined'){ |
| 210 | 207 | // jshint ignore:line |
| 211 | 208 | settings['tooltip']['intersect'] = settings['tooltip']['intersect'] == true || parseInt(settings['tooltip']['intersect']) === 1; // jshint ignore:line |
| 212 | 209 | } |
| @@ -233,15 +230,11 @@ | ||
| 233 | 230 | settings.plugins = { |
| 234 | 231 | legend: settings.legend, |
| 235 | 232 | }; |
| 236 | 233 | |
| 237 | - if(typeof settings['title'] !== 'undefined' && settings['title']['text'] !== ''){ | |
| 238 | - settings.plugins['title'] = {}; | |
| 239 | - settings.plugins['title']['display'] = true; | |
| 240 | - settings.plugins['title']['text'] = settings['title']['text']; | |
| 241 | - } | |
| 234 | + handleAxes(settings, chart); | |
| 242 | 235 | |
| 243 | - handleAxes(settings, chart); | |
| 236 | + override(settings, chart); | |
| 244 | 237 | } |
| 245 | 238 | |
| 246 | 239 | function handleAxes(settings, chart){ |
| 247 | 240 | if(typeof settings['yAxes'] !== 'undefined' && typeof settings['xAxes'] !== 'undefined'){ |
| @@ -278,9 +271,9 @@ | ||
| 278 | 271 | var $o = {}; |
| 279 | 272 | if(Array.isArray(settings[axis][i]) || typeof settings[axis][i] === 'object'){ |
| 280 | 273 | for(var j in settings[axis][i]){ |
| 281 | 274 | var $val = ''; |
| 282 | - if(j === 'labelString'){ | |
| 275 | + if(j === 'labelString'){ | |
| 283 | 276 | $o['display'] = true; |
| 284 | 277 | $val = settings[axis][i][j]; |
| 285 | 278 | }else if(i === 'ticks'){ |
| 286 | 279 | // number values under ticks need to be converted to numbers or the library throws a JS error. |
| @@ -505,9 +498,9 @@ | ||
| 505 | 498 | function override(settings, chart) { |
| 506 | 499 | if (settings.manual) { |
| 507 | 500 | try{ |
| 508 | 501 | var options = JSON.parse(settings.manual); |
| 509 | - $.extend(true, settings, options); | |
| 502 | + $.extend(settings, options); | |
| 510 | 503 | delete settings.manual; |
| 511 | 504 | }catch(error){ |
| 512 | 505 | console.error("Error while adding manual configuration override " + settings.manual); |
| 513 | 506 | } |
