| @@ -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, |
| @@ -240,8 +233,10 @@ | ||
| 240 | 233 | settings.plugins['title']['text'] = settings['title']['text']; |
| 241 | 234 | } |
| 242 | 235 | |
| 243 | 236 | handleAxes(settings, chart); |
| 237 | + | |
| 238 | + override(settings, chart); | |
| 244 | 239 | } |
| 245 | 240 | |
| 246 | 241 | function handleAxes(settings, chart){ |
| 247 | 242 | if(typeof settings['yAxes'] !== 'undefined' && typeof settings['xAxes'] !== 'undefined'){ |
| @@ -505,9 +500,9 @@ | ||
| 505 | 500 | function override(settings, chart) { |
| 506 | 501 | if (settings.manual) { |
| 507 | 502 | try{ |
| 508 | 503 | var options = JSON.parse(settings.manual); |
| 509 | - $.extend(true, settings, options); | |
| 504 | + $.extend(settings, options); | |
| 510 | 505 | delete settings.manual; |
| 511 | 506 | }catch(error){ |
| 512 | 507 | console.error("Error while adding manual configuration override " + settings.manual); |
| 513 | 508 | } |
