| @@ -3,10 +3,8 @@ | ||
| 3 | 3 | /* global console */ |
| 4 | 4 | |
| 5 | 5 | // this will store the images for each chart rendered. |
| 6 | 6 | var __visualizer_chart_images = []; |
| 7 | -var chartWrapperError = []; | |
| 8 | -var isResizeRequest = false; | |
| 9 | 7 | |
| 10 | 8 | (function($) { |
| 11 | 9 | var gv; |
| 12 | 10 | var all_charts, objects; |
| @@ -13,61 +11,17 @@ | ||
| 13 | 11 | // so that we know which charts belong to our library. |
| 14 | 12 | var rendered_charts = []; |
| 15 | 13 | |
| 16 | 14 | function renderChart(id) { |
| 17 | - | |
| 18 | - if ( ! all_charts || 0 === Object.keys( all_charts ).length ) { | |
| 19 | - return; | |
| 20 | - } | |
| 21 | - | |
| 22 | - var chart = all_charts[id]; | |
| 23 | - var hasAnnotation = false; | |
| 24 | - | |
| 25 | - if ( ! chart ) { | |
| 26 | - return; | |
| 27 | - } | |
| 28 | - | |
| 29 | - if ( chart.library && chart.library !== 'google' && chart.library !== 'GoogleCharts' ) { | |
| 30 | - return; | |
| 31 | - } | |
| 32 | - | |
| 33 | - // re-render the chart only if it doesn't have annotations and it is on the front-end | |
| 34 | - // this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize. | |
| 35 | - // remember, some charts do not support annotations so they should not be included in this. | |
| 36 | - var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick']; | |
| 37 | - if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) { | |
| 38 | - var seriesKeys = Object.keys( chart.settings.series ); | |
| 39 | - // Only convert when keys are numeric indices (PHP JSON-encoded array). | |
| 40 | - // String keys (e.g. named series from manual config) must be left as-is. | |
| 41 | - if ( seriesKeys.every( function( k ) { return ! isNaN( k ); } ) ) { | |
| 42 | - var chartSeries = []; | |
| 43 | - var chartSeriesValue = Object.values( chart.settings.series ); | |
| 44 | - $.each( seriesKeys, function( index, element ) { | |
| 45 | - chartSeries[ element ] = chartSeriesValue[ index ]; | |
| 46 | - } ); | |
| 47 | - chart.settings.series = chartSeries; | |
| 48 | - } | |
| 49 | - } | |
| 50 | - if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) { | |
| 51 | - hasAnnotation = chart.series.length - chart.settings.series.length > 1; | |
| 52 | - } | |
| 53 | - | |
| 54 | - if(! hasAnnotation){ | |
| 55 | - renderSpecificChart(id, all_charts[id]); | |
| 56 | - } | |
| 15 | + renderSpecificChart(id, all_charts[id]); | |
| 57 | 16 | } |
| 58 | 17 | |
| 59 | 18 | function renderSpecificChart(id, chart) { |
| 60 | 19 | var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter; |
| 61 | 20 | |
| 62 | - if( chart.library !== 'google' ) { | |
| 21 | + if(chart.library !== 'google'){ | |
| 63 | 22 | return; |
| 64 | 23 | } |
| 65 | - | |
| 66 | - // Bail if the chart is already rendered or is being rendered. | |
| 67 | - if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) { | |
| 68 | - return; | |
| 69 | - } | |
| 70 | 24 | rendered_charts[id] = 'yes'; |
| 71 | 25 | |
| 72 | 26 | series = chart.series; |
| 73 | 27 | data = chart.data; |
| @@ -81,11 +35,8 @@ | ||
| 81 | 35 | |
| 82 | 36 | render = objects[id] || null; |
| 83 | 37 | if (!render) { |
| 84 | 38 | switch (chart.type) { |
| 85 | - case "tabular": | |
| 86 | - render = "Table"; | |
| 87 | - break; | |
| 88 | 39 | case "gauge": |
| 89 | 40 | case "table": |
| 90 | 41 | case "timeline": |
| 91 | 42 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1); |
| @@ -94,43 +45,9 @@ | ||
| 94 | 45 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart'; |
| 95 | 46 | break; |
| 96 | 47 | } |
| 97 | 48 | |
| 98 | - var controlWrapperElement = document.getElementById( "control_wrapper_" + id ) || null; | |
| 99 | - var withControlMode = ( typeof settings.controls !== 'undefined' && '' !== settings.controls.controlType ) && controlWrapperElement ? true : false; | |
| 100 | - | |
| 101 | - if ( $( controlWrapperElement ).hasClass( 'no-filter' ) ) { | |
| 102 | - withControlMode = false; | |
| 103 | - } | |
| 104 | - if ( withControlMode ) { | |
| 105 | - // Chart wrapper. | |
| 106 | - render = new gv.ChartWrapper({ | |
| 107 | - 'chartType': render, | |
| 108 | - 'containerId': id, | |
| 109 | - }); | |
| 110 | - // Chart dashboard wrapper. | |
| 111 | - var chartWrapperElement = document.getElementById( "chart_wrapper_" + id ) || null; | |
| 112 | - var chartWrapper = new gv.Dashboard( chartWrapperElement ); | |
| 113 | - | |
| 114 | - // Error Handler. | |
| 115 | - gv.events.addListener(chartWrapper, 'error', function ( err ) { | |
| 116 | - if ( chartWrapperError.length === 0 ) { | |
| 117 | - chartWrapperError.push( err ); | |
| 118 | - gv.errors.removeError( err.id ); | |
| 119 | - var chartContainer = $( chartWrapperElement ).find( '.visualizer-front' ); | |
| 120 | - if ( chartContainer && chartContainer.is(':visible')) { | |
| 121 | - if (chartContainer.parents('div').next( '#sidebar' ).length === 0) { | |
| 122 | - chartContainer.addClass( 'visualizer-chart-loaded' ).addClass( 'visualizer-cw-error' ); | |
| 123 | - $( chartWrapperElement ).addClass( 'visualizer-cw-error' ); | |
| 124 | - } | |
| 125 | - } | |
| 126 | - } else { | |
| 127 | - gv.errors.removeError( err.id ); | |
| 128 | - } | |
| 129 | - } ); | |
| 130 | - } else { | |
| 131 | - render = new gv[render](container); | |
| 132 | - } | |
| 49 | + render = new gv[render](container); | |
| 133 | 50 | } |
| 134 | 51 | |
| 135 | 52 | if (settings['animation'] && parseInt(settings['animation']['startup']) === 1) |
| 136 | 53 | { |
| @@ -136,53 +53,9 @@ | ||
| 136 | 53 | { |
| 137 | 54 | settings['animation']['startup'] = true; |
| 138 | 55 | settings['animation']['duration'] = parseInt(settings['animation']['duration']); |
| 139 | 56 | } |
| 140 | - if ( settings['controls'] ) { | |
| 141 | - settings['controls']['ui']['allowMultiple'] = 'true' === settings['controls']['allowMultiple'] ? true : false; | |
| 142 | - settings['controls']['ui']['allowTyping'] = 'true' === settings['controls']['allowTyping'] ? true : false; | |
| 143 | - settings['controls']['ui']['showRangeValues'] = 'true' === settings['controls']['showRangeValues'] ? true : false; | |
| 144 | - } | |
| 145 | 57 | |
| 146 | - // mark roles for series that have specified a role | |
| 147 | - // and then remove them from future processing | |
| 148 | - // and also adjust the indices of the series array so that | |
| 149 | - // the ones with a role are ignored | |
| 150 | - // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations | |
| 151 | - // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2) | |
| 152 | - | |
| 153 | - // this will capture all the series indexes that became annotations. | |
| 154 | - var series_annotations = []; | |
| 155 | - if (settings.series) { | |
| 156 | - var adjusted_series = []; | |
| 157 | - for (i = 0; i < settings.series.length; i++) { | |
| 158 | - if (!series[i + 1] || typeof settings.series[i] === 'undefined') { | |
| 159 | - continue; | |
| 160 | - } | |
| 161 | - if(typeof settings.series[i].role !== 'undefined'){ | |
| 162 | - table.setColumnProperty(i + 1, 'role', settings.series[i].role); | |
| 163 | - if(settings.series[i].role === '') { | |
| 164 | - adjusted_series.push(settings.series[i]); | |
| 165 | - }else{ | |
| 166 | - series_annotations.push(i); | |
| 167 | - } | |
| 168 | - } | |
| 169 | - } | |
| 170 | - if(adjusted_series.length > 0){ | |
| 171 | - settings.series = adjusted_series; | |
| 172 | - } | |
| 173 | - } | |
| 174 | - | |
| 175 | - if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line | |
| 176 | - var $explorer = {}; | |
| 177 | - $explorer['keepInBounds'] = true; | |
| 178 | - | |
| 179 | - if ( settings['explorer_actions'] ) { | |
| 180 | - $explorer['actions'] = settings['explorer_actions']; | |
| 181 | - } | |
| 182 | - settings['explorer'] = $explorer; | |
| 183 | - } | |
| 184 | - | |
| 185 | 58 | switch (chart.type) { |
| 186 | 59 | case 'pie': |
| 187 | 60 | if (settings.slices) { |
| 188 | 61 | for (i in settings.slices) { |
| @@ -216,9 +89,8 @@ | ||
| 216 | 89 | settings['region'] = 'world'; |
| 217 | 90 | } |
| 218 | 91 | break; |
| 219 | 92 | case 'table': |
| 220 | - case 'tabular': | |
| 221 | 93 | if (parseInt(settings['pagination']) !== 1) |
| 222 | 94 | { |
| 223 | 95 | delete settings['pageSize']; |
| 224 | 96 | } |
| @@ -224,13 +96,10 @@ | ||
| 224 | 96 | } |
| 225 | 97 | break; |
| 226 | 98 | case 'gauge': |
| 227 | 99 | break; |
| 228 | - case 'bubble': | |
| 229 | - settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line | |
| 230 | - break; | |
| 231 | 100 | case 'timeline': |
| 232 | - settings['timeline'] = {}; | |
| 101 | + settings['timeline'] = []; | |
| 233 | 102 | settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false; |
| 234 | 103 | settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false; |
| 235 | 104 | settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false; |
| 236 | 105 | if(settings['singleColor'] !== '') { |
| @@ -286,12 +155,8 @@ | ||
| 286 | 155 | |
| 287 | 156 | delete axis.viewWindow[property]; |
| 288 | 157 | } |
| 289 | 158 | } |
| 290 | - | |
| 291 | - if(settings.hAxis && settings.hAxis.format == ''){ | |
| 292 | - settings.hAxis.format = 'yyyy-MM-dd'; | |
| 293 | - } | |
| 294 | 159 | } |
| 295 | 160 | |
| 296 | 161 | if(settings.hAxis){ |
| 297 | 162 | if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){ |
| @@ -311,38 +176,16 @@ | ||
| 311 | 176 | |
| 312 | 177 | for (i = 0; i < data.length; i++) { |
| 313 | 178 | row = []; |
| 314 | 179 | for (j = 0; j < series.length; j++) { |
| 315 | - switch(series[j].type) { | |
| 316 | - case 'string': | |
| 317 | - if(data[i][j] === ''){ | |
| 318 | - data[i][j] = null; | |
| 319 | - } | |
| 320 | - break; | |
| 321 | - case 'boolean': | |
| 322 | - if (typeof data[i][j] === 'string'){ | |
| 323 | - data[i][j] = data[i][j] === 'true'; | |
| 324 | - } | |
| 325 | - break; | |
| 326 | - case 'date': | |
| 327 | - // fall-through. | |
| 328 | - case 'datetime': | |
| 329 | - if (typeof data[i][j] === 'string') { | |
| 330 | - var dateParse = Date.parse(data[i][j].replace(/-/g, '/')); | |
| 331 | - if ( isNaN( dateParse ) ) { | |
| 332 | - dateParse = Date.parse(data[i][j]); | |
| 333 | - } | |
| 334 | - date = new Date( dateParse ); | |
| 335 | - } else if(typeof data[i][j] === 'object') { | |
| 336 | - date = data[i][j]; | |
| 337 | - } | |
| 338 | - data[i][j] = null; | |
| 339 | - if (Object.prototype.toString.call(date) === "[object Date]") { | |
| 340 | - if (!isNaN(date.getTime())) { | |
| 341 | - data[i][j] = date; | |
| 342 | - } | |
| 343 | - } | |
| 344 | - break; | |
| 180 | + if (series[j].type === 'date' || series[j].type === 'datetime') { | |
| 181 | + date = new Date(data[i][j]); | |
| 182 | + data[i][j] = null; | |
| 183 | + if (Object.prototype.toString.call(date) === "[object Date]") { | |
| 184 | + if (!isNaN(date.getTime())) { | |
| 185 | + data[i][j] = date; | |
| 186 | + } | |
| 187 | + } | |
| 345 | 188 | } |
| 346 | 189 | row.push(data[i][j]); |
| 347 | 190 | } |
| 348 | 191 | table.addRow(row); |
| @@ -350,9 +193,8 @@ | ||
| 350 | 193 | |
| 351 | 194 | if (settings.series) { |
| 352 | 195 | switch(chart.type){ |
| 353 | 196 | case 'table': |
| 354 | - case 'tabular': | |
| 355 | 197 | for(i in settings.series){ |
| 356 | 198 | i = parseInt(i); |
| 357 | 199 | if (!series[i + 1]) { |
| 358 | 200 | continue; |
| @@ -360,16 +202,13 @@ | ||
| 360 | 202 | format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); |
| 361 | 203 | } |
| 362 | 204 | break; |
| 363 | 205 | default: |
| 364 | - // Single-pass: walk columns, skip annotation/helper roles, apply formats in order. | |
| 365 | - var k = 0; // index into settings.series (visible series) | |
| 366 | - for (var c = 1; c < series.length && k < settings.series.length; c++) { // skip label at 0 | |
| 367 | - if (table.getColumnProperty(c, 'role')) continue; // helper/annotation column | |
| 368 | - var s = settings.series[k++]; | |
| 369 | - if (!s || !s.format) continue; | |
| 370 | - if (!series[c]) continue; | |
| 371 | - format_data(id, table, series[c].type, s.format, c); | |
| 206 | + for (i = 0; i < settings.series.length; i++) { | |
| 207 | + if (!series[i + 1]) { | |
| 208 | + continue; | |
| 209 | + } | |
| 210 | + format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 372 | 211 | } |
| 373 | 212 | break; |
| 374 | 213 | } |
| 375 | 214 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| @@ -374,78 +213,23 @@ | ||
| 374 | 213 | } |
| 375 | 214 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| 376 | 215 | format_data(id, table, 'number', settings.format, 1); |
| 377 | 216 | } |
| 378 | - | |
| 379 | - if(settings.hAxis && series[0]) { | |
| 380 | - format_data(id, table, series[0].type, settings.hAxis.format, 0); | |
| 381 | - } | |
| 382 | - | |
| 383 | 217 | override(settings); |
| 384 | 218 | |
| 385 | 219 | gv.events.addListener(render, 'ready', function () { |
| 386 | 220 | var arr = id.split('-'); |
| 387 | - render = typeof render.getChart !== 'undefined' ? render.getChart() : render; | |
| 388 | 221 | __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = ''; |
| 389 | - | |
| 390 | - if (render.container && $(render.container).is(':visible')) { | |
| 391 | - if ($(render.container).parents('div').next( '#sidebar' ).length === 0) { | |
| 392 | - $(render.container).addClass( 'visualizer-chart-loaded' ); | |
| 393 | - } | |
| 394 | - } | |
| 395 | - | |
| 396 | 222 | try{ |
| 397 | - if ( typeof render.getImageURI !== 'undefined' ) { | |
| 398 | - var img = render.getImageURI(); | |
| 399 | - __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 400 | - $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 401 | - if ( $( '#chart-img' ).length ) { | |
| 402 | - $( '#chart-img' ).val( img ); | |
| 403 | - } | |
| 404 | - } | |
| 223 | + var img = render.getImageURI(); | |
| 224 | + __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 225 | + $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 405 | 226 | }catch(error){ |
| 406 | - var canvas = document.getElementById( 'canvas' ); | |
| 407 | - domtoimage.toPng(canvas) | |
| 408 | - .then(function ( img ) { | |
| 409 | - __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 410 | - $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 411 | - if ( $( '#chart-img' ).length ) { | |
| 412 | - $( '#chart-img' ).val( img ); | |
| 413 | - } | |
| 414 | - }) | |
| 415 | - .catch(function (error) { | |
| 416 | - console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); | |
| 417 | - }); | |
| 227 | + console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); | |
| 418 | 228 | } |
| 419 | 229 | }); |
| 420 | 230 | |
| 421 | - if ( withControlMode ) { | |
| 422 | - // alert( chart.is_library_page ); | |
| 423 | - // Create a control wrapper, passing some options. | |
| 424 | - var controlWrapper = new gv.ControlWrapper( { | |
| 425 | - containerId: 'control_wrapper_' + id, | |
| 426 | - controlType: settings.controls.controlType, | |
| 427 | - 'options': settings.controls, | |
| 428 | - } ); | |
| 429 | - | |
| 430 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 431 | - render.setOptions(settings); | |
| 432 | - chartWrapper.bind(controlWrapper, render); | |
| 433 | - chartWrapper.draw(table); | |
| 434 | - | |
| 435 | - gv.events.addListener(controlWrapper, 'ready', function ( err ) { | |
| 436 | - if ( 'vertical' === settings.controls.ui.orientation ) { | |
| 437 | - if ( 'canvas' === id ) { | |
| 438 | - jQuery( '#' + id ).addClass( 'vz-vertical' ); | |
| 439 | - } | |
| 440 | - } else { | |
| 441 | - jQuery( '#' + id ).removeClass( 'vz-vertical' ); | |
| 442 | - } | |
| 443 | - }); | |
| 444 | - } else { | |
| 445 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 446 | - render.draw(table, settings); | |
| 447 | - } | |
| 231 | + render.draw(table, settings); | |
| 448 | 232 | } |
| 449 | 233 | |
| 450 | 234 | function format_data(id, table, type, format, index) { |
| 451 | 235 | if (!format || format === '') { |
| @@ -452,32 +236,21 @@ | ||
| 452 | 236 | return; |
| 453 | 237 | } |
| 454 | 238 | |
| 455 | 239 | var formatter = null; |
| 456 | - var $formatInput = $('input.control-text[name*="[format]"]').filter(function() { | |
| 457 | - return $(this).val() === format; | |
| 458 | - }); | |
| 459 | - try { | |
| 460 | - switch (type) { | |
| 461 | - case 'number': | |
| 462 | - formatter = new gv.NumberFormat({pattern: format}); | |
| 463 | - break; | |
| 464 | - case 'date': | |
| 465 | - case 'datetime': | |
| 466 | - case 'timeofday': | |
| 467 | - formatter = new gv.DateFormat({pattern: format}); | |
| 468 | - break; | |
| 469 | - } | |
| 240 | + switch (type) { | |
| 241 | + case 'number': | |
| 242 | + formatter = new gv.NumberFormat({pattern: format}); | |
| 243 | + break; | |
| 244 | + case 'date': | |
| 245 | + case 'datetime': | |
| 246 | + case 'timeofday': | |
| 247 | + formatter = new gv.DateFormat({pattern: format}); | |
| 248 | + break; | |
| 249 | + } | |
| 470 | 250 | |
| 471 | - if (formatter) { | |
| 472 | - formatter.format(table, index); | |
| 473 | - $formatInput.nextAll('.visualizer-format-error').remove(); | |
| 474 | - } | |
| 475 | - } catch (e) { | |
| 476 | - if ($formatInput.length) { | |
| 477 | - $formatInput.nextAll('.visualizer-format-error').remove(); | |
| 478 | - $('<p class="visualizer-format-error" style="color:#cc0000;margin:4px 0 0"></p>').text(visualizer.l10n.invalid_format).insertAfter($formatInput); | |
| 479 | - } | |
| 251 | + if (formatter) { | |
| 252 | + formatter.format(table, index); | |
| 480 | 253 | } |
| 481 | 254 | |
| 482 | 255 | var arr = id.split('-'); |
| 483 | 256 | $('body').trigger('visualizer:format:chart', {id: parseInt(arr[1]), data: table, column: index}); |
| @@ -497,39 +270,32 @@ | ||
| 497 | 270 | } |
| 498 | 271 | |
| 499 | 272 | function render() { |
| 500 | 273 | for (var id in (all_charts || {})) { |
| 501 | - var chartElement = document.getElementById( id ); | |
| 502 | - if (chartElement && chartElement.offsetParent) { | |
| 503 | - renderChart(id); | |
| 504 | - } | |
| 274 | + renderChart(id); | |
| 505 | 275 | } |
| 506 | 276 | } |
| 507 | 277 | |
| 278 | + if(typeof visualizer !== 'undefined'){ | |
| 279 | + // called while updating the chart. | |
| 280 | + visualizer.update = function(){ | |
| 281 | + renderChart('canvas'); | |
| 282 | + }; | |
| 283 | + } | |
| 284 | + | |
| 285 | + | |
| 508 | 286 | var resizeTimeout; |
| 509 | 287 | |
| 510 | 288 | $(document).ready(function() { |
| 511 | - $(window).resize(function(e) { | |
| 289 | + $(window).resize(function() { | |
| 512 | 290 | clearTimeout(resizeTimeout); |
| 513 | - window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false; | |
| 514 | 291 | resizeTimeout = setTimeout(render, 100); |
| 515 | 292 | }); |
| 516 | 293 | |
| 517 | 294 | resizeHiddenContainers(true); |
| 518 | - | |
| 519 | - if ( $( '.visualizer-hidden-container' ).length ) { | |
| 520 | - setInterval( function() { | |
| 521 | - $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize(); | |
| 522 | - }, 500 ); | |
| 523 | - } | |
| 524 | - | |
| 525 | - window.addEventListener( 'orientationchange', function() { | |
| 526 | - $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize(); | |
| 527 | - }, false); | |
| 528 | 295 | }); |
| 529 | 296 | |
| 530 | 297 | $(window).on('load', function(){ |
| 531 | - $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize(); | |
| 532 | 298 | resizeHiddenContainers(true); |
| 533 | 299 | }); |
| 534 | 300 | |
| 535 | 301 | function resizeHiddenContainers(everytime){ |
| @@ -563,12 +329,8 @@ | ||
| 563 | 329 | if(v.is_front == true){ // jshint ignore:line |
| 564 | 330 | // check what all chart types to load. |
| 565 | 331 | $chart_types = []; |
| 566 | 332 | $.each(v.charts, function(i, c){ |
| 567 | - // Only consider charts rendered by Google Charts. | |
| 568 | - if ( c.library && c.library !== 'google' && c.library !== 'GoogleCharts' ) { | |
| 569 | - return; | |
| 570 | - } | |
| 571 | 333 | var $type = c.type; |
| 572 | 334 | switch($type){ |
| 573 | 335 | case 'bar': |
| 574 | 336 | case 'column': |
| @@ -581,25 +343,18 @@ | ||
| 581 | 343 | case 'combo': |
| 582 | 344 | case 'candlestick': |
| 583 | 345 | case 'histogram': |
| 584 | 346 | case 'scatter': |
| 585 | - case 'bubble': | |
| 586 | 347 | $type = 'corechart'; |
| 587 | 348 | break; |
| 588 | 349 | case 'geo': |
| 589 | 350 | $type = 'geochart'; |
| 590 | 351 | break; |
| 591 | - case 'tabular': | |
| 592 | - case 'table': | |
| 593 | - $type = 'table'; | |
| 594 | - break; | |
| 595 | 352 | case 'dataTable': |
| 596 | - case 'polarArea': | |
| 597 | - case 'radar': | |
| 598 | 353 | $type = null; |
| 599 | 354 | break; |
| 600 | 355 | } |
| 601 | - if($type != null && $type !== ''){ | |
| 356 | + if($type != null){ | |
| 602 | 357 | $chart_types.push($type); |
| 603 | 358 | } |
| 604 | 359 | }); |
| 605 | 360 | } |
| @@ -604,24 +359,14 @@ | ||
| 604 | 359 | }); |
| 605 | 360 | } |
| 606 | 361 | |
| 607 | 362 | objects = {}; |
| 608 | - if ( 'object' === typeof google ) { | |
| 609 | - $chart_types.push( 'controls' ); | |
| 610 | - google.load( 'visualization', '51', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language, | |
| 611 | - callback: function () { | |
| 612 | - gv = google.visualization; | |
| 613 | - all_charts = v.charts; | |
| 614 | - if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line | |
| 615 | - if ( document.getElementById( v.id ).offsetParent !== null ) { | |
| 616 | - renderChart(v.id); | |
| 617 | - } | |
| 618 | - } else { | |
| 619 | - render(); | |
| 620 | - } | |
| 621 | - } | |
| 622 | - }); | |
| 623 | - } | |
| 363 | + google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language}); | |
| 364 | + google.charts.setOnLoadCallback(function() { | |
| 365 | + gv = google.visualization; | |
| 366 | + all_charts = v.charts; | |
| 367 | + render(); | |
| 368 | + }); | |
| 624 | 369 | }); |
| 625 | 370 | |
| 626 | 371 | $('body').on('visualizer:render:specificchart:start', function(event, v){ |
| 627 | 372 | objects = {}; |
| @@ -628,23 +373,18 @@ | ||
| 628 | 373 | gv = google.visualization; |
| 629 | 374 | renderSpecificChart(v.id, v.chart); |
| 630 | 375 | }); |
| 631 | 376 | |
| 632 | - $('body').on('visualizer:render:currentchart:update', function(event, v){ | |
| 633 | - renderChart('canvas'); | |
| 634 | - }); | |
| 635 | - | |
| 636 | 377 | // front end actions |
| 637 | - // 'image' is also called from the library | |
| 638 | 378 | $('body').on('visualizer:action:specificchart', function(event, v){ |
| 639 | - var id = v.id; | |
| 640 | - if(typeof rendered_charts[id] === 'undefined'){ | |
| 641 | - return; | |
| 642 | - } | |
| 643 | - var arr = id.split('-'); | |
| 644 | - var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ]; | |
| 645 | 379 | switch(v.action){ |
| 646 | 380 | case 'print': |
| 381 | + var id = v.id; | |
| 382 | + if(typeof rendered_charts[id] === 'undefined'){ | |
| 383 | + return; | |
| 384 | + } | |
| 385 | + var arr = id.split('-'); | |
| 386 | + var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ]; | |
| 647 | 387 | // for charts that have no rendered image defined, we print the data instead. |
| 648 | 388 | var html = v.data; |
| 649 | 389 | if(img !== ''){ |
| 650 | 390 | html = "<html><body><img src='" + img + "' /></body></html>"; |
| @@ -650,30 +390,8 @@ | ||
| 650 | 390 | html = "<html><body><img src='" + img + "' /></body></html>"; |
| 651 | 391 | } |
| 652 | 392 | $('body').trigger('visualizer:action:specificchart:defaultprint', {data: html}); |
| 653 | 393 | break; |
| 654 | - case 'image': | |
| 655 | - if(img !== ''){ | |
| 656 | - var $a = $("<a>"); // jshint ignore:line | |
| 657 | - $a.attr("href", img); | |
| 658 | - $("body").append($a); | |
| 659 | - $a.attr("download", v.dataObj.name); | |
| 660 | - $a[0].click(); | |
| 661 | - $a.remove(); | |
| 662 | - }else{ | |
| 663 | - console.warn("No image generated"); | |
| 664 | - } | |
| 665 | - break; | |
| 666 | 394 | } |
| 667 | 395 | }); |
| 668 | 396 | |
| 669 | - var timer = 0; | |
| 670 | - $( document ).on( 'input', '.series-linewidth', function() { | |
| 671 | - var seriesLineWidth = $( this ); | |
| 672 | - clearTimeout( timer ); | |
| 673 | - timer = setTimeout( function() { | |
| 674 | - if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) { | |
| 675 | - seriesLineWidth.val( '0.1' ); | |
| 676 | - } | |
| 677 | - }, 700 ); | |
| 678 | - } ); | |
| 679 | 397 | })(jQuery); |
