| @@ -7,10 +7,8 @@ | ||
| 7 | 7 | |
| 8 | 8 | (function($) { |
| 9 | 9 | var gv; |
| 10 | 10 | var all_charts, objects; |
| 11 | - // so that we know which charts belong to our library. | |
| 12 | - var rendered_charts = []; | |
| 13 | 11 | |
| 14 | 12 | function renderChart(id) { |
| 15 | 13 | renderSpecificChart(id, all_charts[id]); |
| 16 | 14 | } |
| @@ -20,9 +18,8 @@ | ||
| 20 | 18 | |
| 21 | 19 | if(chart.library !== 'google'){ |
| 22 | 20 | return; |
| 23 | 21 | } |
| 24 | - rendered_charts[id] = 'yes'; | |
| 25 | 22 | |
| 26 | 23 | series = chart.series; |
| 27 | 24 | data = chart.data; |
| 28 | 25 | settings = chart.settings; |
| @@ -134,9 +131,8 @@ | ||
| 134 | 131 | case 'area': |
| 135 | 132 | case 'scatter': |
| 136 | 133 | case 'candlestick': |
| 137 | 134 | case 'column': |
| 138 | - case 'combo': | |
| 139 | 135 | axis = settings.hAxis; |
| 140 | 136 | break; |
| 141 | 137 | case 'bar': |
| 142 | 138 | axis = settings.vAxis; |
| @@ -217,9 +213,8 @@ | ||
| 217 | 213 | override(settings); |
| 218 | 214 | |
| 219 | 215 | gv.events.addListener(render, 'ready', function () { |
| 220 | 216 | var arr = id.split('-'); |
| 221 | - __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = ''; | |
| 222 | 217 | try{ |
| 223 | 218 | var img = render.getImageURI(); |
| 224 | 219 | __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; |
| 225 | 220 | $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); |
| @@ -293,9 +288,9 @@ | ||
| 293 | 288 | |
| 294 | 289 | resizeHiddenContainers(true); |
| 295 | 290 | }); |
| 296 | 291 | |
| 297 | - $(window).on('load', function(){ | |
| 292 | + $(window).load(function(){ | |
| 298 | 293 | resizeHiddenContainers(true); |
| 299 | 294 | }); |
| 300 | 295 | |
| 301 | 296 | function resizeHiddenContainers(everytime){ |
| @@ -337,27 +332,7 @@ | ||
| 337 | 332 | $('body').on('visualizer:render:specificchart:start', function(event, v){ |
| 338 | 333 | objects = {}; |
| 339 | 334 | gv = google.visualization; |
| 340 | 335 | renderSpecificChart(v.id, v.chart); |
| 341 | - }); | |
| 342 | - | |
| 343 | - // front end actions | |
| 344 | - $('body').on('visualizer:action:specificchart', function(event, v){ | |
| 345 | - switch(v.action){ | |
| 346 | - case 'print': | |
| 347 | - var id = v.id; | |
| 348 | - if(typeof rendered_charts[id] === 'undefined'){ | |
| 349 | - return; | |
| 350 | - } | |
| 351 | - var arr = id.split('-'); | |
| 352 | - var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ]; | |
| 353 | - // for charts that have no rendered image defined, we print the data instead. | |
| 354 | - var html = v.data; | |
| 355 | - if(img !== ''){ | |
| 356 | - html = "<html><body><img src='" + img + "' /></body></html>"; | |
| 357 | - } | |
| 358 | - $('body').trigger('visualizer:action:specificchart:defaultprint', {data: html}); | |
| 359 | - break; | |
| 360 | - } | |
| 361 | 336 | }); |
| 362 | 337 | |
| 363 | 338 | })(jQuery); |
