| @@ -23,8 +23,13 @@ | ||
| 23 | 23 | |
| 24 | 24 | if(chart.library !== 'datatables'){ |
| 25 | 25 | return; |
| 26 | 26 | } |
| 27 | + | |
| 28 | + // Bail if the chart is already rendered or is being rendered. | |
| 29 | + if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) { | |
| 30 | + return; | |
| 31 | + } | |
| 27 | 32 | rendered_charts[id] = 'yes'; |
| 28 | 33 | |
| 29 | 34 | series = chart.series; |
| 30 | 35 | data = chart.data; |
| @@ -67,9 +72,9 @@ | ||
| 67 | 72 | delete chart.settings['scrollX']; |
| 68 | 73 | delete chart.settings['scrollY']; |
| 69 | 74 | delete chart.settings['scrollY_int']; |
| 70 | 75 | $.extend( settings, { |
| 71 | - scrollX: 150, | |
| 76 | + scrollX: '100%', | |
| 72 | 77 | scrollY: (( chart.settings['responsive_bool'] === 'true' ? 0.8 : 0.5 ) * parseInt($(container).css('height').replace('px',''))), |
| 73 | 78 | scrollCollapse: true |
| 74 | 79 | } ); |
| 75 | 80 | }else{ |
| @@ -77,9 +82,9 @@ | ||
| 77 | 82 | chart.settings['scrollY_int']; |
| 78 | 83 | } |
| 79 | 84 | delete chart.settings['scrollX']; |
| 80 | 85 | $.extend( settings, { |
| 81 | - scrollX: 150, | |
| 86 | + scrollX: '100%', | |
| 82 | 87 | scrollY: 180, |
| 83 | 88 | } ); |
| 84 | 89 | } |
| 85 | 90 | break; |