| @@ -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,27 @@ | ||
| 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 | 15 | var chart = all_charts[id]; |
| 23 | 16 | var hasAnnotation = false; |
| 24 | - | |
| 25 | - if ( ! chart ) { | |
| 26 | - return; | |
| 17 | + if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined'){ | |
| 18 | + hasAnnotation = chart.series.length - chart.settings.series.length > 1; | |
| 27 | 19 | } |
| 28 | - | |
| 29 | - if ( chart.library && chart.library !== 'google' && chart.library !== 'GoogleCharts' ) { | |
| 30 | - return; | |
| 31 | - } | |
| 32 | - | |
| 33 | 20 | // re-render the chart only if it doesn't have annotations and it is on the front-end |
| 34 | 21 | // 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 | - } | |
| 22 | + if(hasAnnotation){ | |
| 23 | + return; | |
| 49 | 24 | } |
| 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 | - } | |
| 25 | + renderSpecificChart(id, all_charts[id]); | |
| 57 | 26 | } |
| 58 | 27 | |
| 59 | 28 | function renderSpecificChart(id, chart) { |
| 60 | 29 | var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter; |
| 61 | 30 | |
| 62 | - if( chart.library !== 'google' ) { | |
| 31 | + if(chart.library !== 'google'){ | |
| 63 | 32 | return; |
| 64 | 33 | } |
| 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 | 34 | rendered_charts[id] = 'yes'; |
| 71 | 35 | |
| 72 | 36 | series = chart.series; |
| 73 | 37 | data = chart.data; |
| @@ -81,11 +45,8 @@ | ||
| 81 | 45 | |
| 82 | 46 | render = objects[id] || null; |
| 83 | 47 | if (!render) { |
| 84 | 48 | switch (chart.type) { |
| 85 | - case "tabular": | |
| 86 | - render = "Table"; | |
| 87 | - break; | |
| 88 | 49 | case "gauge": |
| 89 | 50 | case "table": |
| 90 | 51 | case "timeline": |
| 91 | 52 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1); |
| @@ -94,43 +55,9 @@ | ||
| 94 | 55 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart'; |
| 95 | 56 | break; |
| 96 | 57 | } |
| 97 | 58 | |
| 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 | - } | |
| 59 | + render = new gv[render](container); | |
| 133 | 60 | } |
| 134 | 61 | |
| 135 | 62 | if (settings['animation'] && parseInt(settings['animation']['startup']) === 1) |
| 136 | 63 | { |
| @@ -136,13 +63,8 @@ | ||
| 136 | 63 | { |
| 137 | 64 | settings['animation']['startup'] = true; |
| 138 | 65 | settings['animation']['duration'] = parseInt(settings['animation']['duration']); |
| 139 | 66 | } |
| 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 | 67 | |
| 146 | 68 | // mark roles for series that have specified a role |
| 147 | 69 | // and then remove them from future processing |
| 148 | 70 | // and also adjust the indices of the series array so that |
| @@ -148,11 +70,8 @@ | ||
| 148 | 70 | // and also adjust the indices of the series array so that |
| 149 | 71 | // the ones with a role are ignored |
| 150 | 72 | // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations |
| 151 | 73 | // 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 | 74 | if (settings.series) { |
| 156 | 75 | var adjusted_series = []; |
| 157 | 76 | for (i = 0; i < settings.series.length; i++) { |
| 158 | 77 | if (!series[i + 1] || typeof settings.series[i] === 'undefined') { |
| @@ -161,10 +80,8 @@ | ||
| 161 | 80 | if(typeof settings.series[i].role !== 'undefined'){ |
| 162 | 81 | table.setColumnProperty(i + 1, 'role', settings.series[i].role); |
| 163 | 82 | if(settings.series[i].role === '') { |
| 164 | 83 | adjusted_series.push(settings.series[i]); |
| 165 | - }else{ | |
| 166 | - series_annotations.push(i); | |
| 167 | 84 | } |
| 168 | 85 | } |
| 169 | 86 | } |
| 170 | 87 | if(adjusted_series.length > 0){ |
| @@ -216,9 +133,8 @@ | ||
| 216 | 133 | settings['region'] = 'world'; |
| 217 | 134 | } |
| 218 | 135 | break; |
| 219 | 136 | case 'table': |
| 220 | - case 'tabular': | |
| 221 | 137 | if (parseInt(settings['pagination']) !== 1) |
| 222 | 138 | { |
| 223 | 139 | delete settings['pageSize']; |
| 224 | 140 | } |
| @@ -228,9 +144,9 @@ | ||
| 228 | 144 | case 'bubble': |
| 229 | 145 | settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line |
| 230 | 146 | break; |
| 231 | 147 | case 'timeline': |
| 232 | - settings['timeline'] = {}; | |
| 148 | + settings['timeline'] = []; | |
| 233 | 149 | settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false; |
| 234 | 150 | settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false; |
| 235 | 151 | settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false; |
| 236 | 152 | if(settings['singleColor'] !== '') { |
| @@ -286,12 +202,8 @@ | ||
| 286 | 202 | |
| 287 | 203 | delete axis.viewWindow[property]; |
| 288 | 204 | } |
| 289 | 205 | } |
| 290 | - | |
| 291 | - if(settings.hAxis && settings.hAxis.format == ''){ | |
| 292 | - settings.hAxis.format = 'yyyy-MM-dd'; | |
| 293 | - } | |
| 294 | 206 | } |
| 295 | 207 | |
| 296 | 208 | if(settings.hAxis){ |
| 297 | 209 | if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){ |
| @@ -325,17 +237,9 @@ | ||
| 325 | 237 | break; |
| 326 | 238 | case 'date': |
| 327 | 239 | // fall-through. |
| 328 | 240 | 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 | - } | |
| 241 | + date = new Date(data[i][j]); | |
| 338 | 242 | data[i][j] = null; |
| 339 | 243 | if (Object.prototype.toString.call(date) === "[object Date]") { |
| 340 | 244 | if (!isNaN(date.getTime())) { |
| 341 | 245 | data[i][j] = date; |
| @@ -350,9 +254,8 @@ | ||
| 350 | 254 | |
| 351 | 255 | if (settings.series) { |
| 352 | 256 | switch(chart.type){ |
| 353 | 257 | case 'table': |
| 354 | - case 'tabular': | |
| 355 | 258 | for(i in settings.series){ |
| 356 | 259 | i = parseInt(i); |
| 357 | 260 | if (!series[i + 1]) { |
| 358 | 261 | continue; |
| @@ -360,16 +263,13 @@ | ||
| 360 | 263 | format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); |
| 361 | 264 | } |
| 362 | 265 | break; |
| 363 | 266 | 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); | |
| 267 | + for (i = 0; i < settings.series.length; i++) { | |
| 268 | + if (!series[i + 1] || typeof settings.series[i] === 'undefined') { | |
| 269 | + continue; | |
| 270 | + } | |
| 271 | + format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 372 | 272 | } |
| 373 | 273 | break; |
| 374 | 274 | } |
| 375 | 275 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| @@ -383,69 +283,21 @@ | ||
| 383 | 283 | override(settings); |
| 384 | 284 | |
| 385 | 285 | gv.events.addListener(render, 'ready', function () { |
| 386 | 286 | var arr = id.split('-'); |
| 387 | - render = typeof render.getChart !== 'undefined' ? render.getChart() : render; | |
| 388 | 287 | __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 | 288 | 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 | - } | |
| 289 | + var img = render.getImageURI(); | |
| 290 | + __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 291 | + $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 405 | 292 | }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 | - }); | |
| 293 | + console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); | |
| 418 | 294 | } |
| 419 | 295 | }); |
| 420 | 296 | |
| 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 | - } ); | |
| 297 | + $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 429 | 298 | |
| 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 | - } | |
| 299 | + render.draw(table, settings); | |
| 448 | 300 | } |
| 449 | 301 | |
| 450 | 302 | function format_data(id, table, type, format, index) { |
| 451 | 303 | if (!format || format === '') { |
| @@ -452,32 +304,21 @@ | ||
| 452 | 304 | return; |
| 453 | 305 | } |
| 454 | 306 | |
| 455 | 307 | 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 | - } | |
| 308 | + switch (type) { | |
| 309 | + case 'number': | |
| 310 | + formatter = new gv.NumberFormat({pattern: format}); | |
| 311 | + break; | |
| 312 | + case 'date': | |
| 313 | + case 'datetime': | |
| 314 | + case 'timeofday': | |
| 315 | + formatter = new gv.DateFormat({pattern: format}); | |
| 316 | + break; | |
| 317 | + } | |
| 470 | 318 | |
| 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 | - } | |
| 319 | + if (formatter) { | |
| 320 | + formatter.format(table, index); | |
| 480 | 321 | } |
| 481 | 322 | |
| 482 | 323 | var arr = id.split('-'); |
| 483 | 324 | $('body').trigger('visualizer:format:chart', {id: parseInt(arr[1]), data: table, column: index}); |
| @@ -497,12 +338,9 @@ | ||
| 497 | 338 | } |
| 498 | 339 | |
| 499 | 340 | function render() { |
| 500 | 341 | for (var id in (all_charts || {})) { |
| 501 | - var chartElement = document.getElementById( id ); | |
| 502 | - if (chartElement && chartElement.offsetParent) { | |
| 503 | - renderChart(id); | |
| 504 | - } | |
| 342 | + renderChart(id); | |
| 505 | 343 | } |
| 506 | 344 | } |
| 507 | 345 | |
| 508 | 346 | var resizeTimeout; |
| @@ -507,29 +345,17 @@ | ||
| 507 | 345 | |
| 508 | 346 | var resizeTimeout; |
| 509 | 347 | |
| 510 | 348 | $(document).ready(function() { |
| 511 | - $(window).resize(function(e) { | |
| 349 | + $(window).resize(function() { | |
| 512 | 350 | clearTimeout(resizeTimeout); |
| 513 | - window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false; | |
| 514 | 351 | resizeTimeout = setTimeout(render, 100); |
| 515 | 352 | }); |
| 516 | 353 | |
| 517 | 354 | 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 | 355 | }); |
| 529 | 356 | |
| 530 | 357 | $(window).on('load', function(){ |
| 531 | - $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize(); | |
| 532 | 358 | resizeHiddenContainers(true); |
| 533 | 359 | }); |
| 534 | 360 | |
| 535 | 361 | function resizeHiddenContainers(everytime){ |
| @@ -563,12 +389,8 @@ | ||
| 563 | 389 | if(v.is_front == true){ // jshint ignore:line |
| 564 | 390 | // check what all chart types to load. |
| 565 | 391 | $chart_types = []; |
| 566 | 392 | $.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 | 393 | var $type = c.type; |
| 572 | 394 | switch($type){ |
| 573 | 395 | case 'bar': |
| 574 | 396 | case 'column': |
| @@ -587,12 +409,8 @@ | ||
| 587 | 409 | break; |
| 588 | 410 | case 'geo': |
| 589 | 411 | $type = 'geochart'; |
| 590 | 412 | break; |
| 591 | - case 'tabular': | |
| 592 | - case 'table': | |
| 593 | - $type = 'table'; | |
| 594 | - break; | |
| 595 | 413 | case 'dataTable': |
| 596 | 414 | case 'polarArea': |
| 597 | 415 | case 'radar': |
| 598 | 416 | $type = null; |
| @@ -597,9 +415,9 @@ | ||
| 597 | 415 | case 'radar': |
| 598 | 416 | $type = null; |
| 599 | 417 | break; |
| 600 | 418 | } |
| 601 | - if($type != null && $type !== ''){ | |
| 419 | + if($type != null){ | |
| 602 | 420 | $chart_types.push($type); |
| 603 | 421 | } |
| 604 | 422 | }); |
| 605 | 423 | } |
| @@ -604,24 +422,14 @@ | ||
| 604 | 422 | }); |
| 605 | 423 | } |
| 606 | 424 | |
| 607 | 425 | 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 | - } | |
| 426 | + google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language}); | |
| 427 | + google.charts.setOnLoadCallback(function() { | |
| 428 | + gv = google.visualization; | |
| 429 | + all_charts = v.charts; | |
| 430 | + render(); | |
| 431 | + }); | |
| 624 | 432 | }); |
| 625 | 433 | |
| 626 | 434 | $('body').on('visualizer:render:specificchart:start', function(event, v){ |
| 627 | 435 | objects = {}; |
| @@ -665,15 +473,5 @@ | ||
| 665 | 473 | break; |
| 666 | 474 | } |
| 667 | 475 | }); |
| 668 | 476 | |
| 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 | 477 | })(jQuery); |
