| @@ -3,9 +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 | 7 | |
| 9 | 8 | (function($) { |
| 10 | 9 | var gv; |
| 11 | 10 | var all_charts, objects; |
| @@ -39,9 +38,9 @@ | ||
| 39 | 38 | |
| 40 | 39 | function renderSpecificChart(id, chart) { |
| 41 | 40 | var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter; |
| 42 | 41 | |
| 43 | - if ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader)' ).length > 0 ) ) { | |
| 42 | + if ( $('#' + id).hasClass('visualizer-chart-loaded') ) { | |
| 44 | 43 | return; |
| 45 | 44 | } |
| 46 | 45 | |
| 47 | 46 | if(chart.library !== 'google'){ |
| @@ -74,43 +73,9 @@ | ||
| 74 | 73 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart'; |
| 75 | 74 | break; |
| 76 | 75 | } |
| 77 | 76 | |
| 78 | - var controlWrapperElement = document.getElementById( "control_wrapper_" + id ) || null; | |
| 79 | - var withControlMode = ( typeof settings.controls !== 'undefined' && '' !== settings.controls.controlType ) && controlWrapperElement ? true : false; | |
| 80 | - | |
| 81 | - if ( $( controlWrapperElement ).hasClass( 'no-filter' ) ) { | |
| 82 | - withControlMode = false; | |
| 83 | - } | |
| 84 | - if ( withControlMode ) { | |
| 85 | - // Chart wrapper. | |
| 86 | - render = new gv.ChartWrapper({ | |
| 87 | - 'chartType': render, | |
| 88 | - 'containerId': id, | |
| 89 | - }); | |
| 90 | - // Chart dashboard wrapper. | |
| 91 | - var chartWrapperElement = document.getElementById( "chart_wrapper_" + id ) || null; | |
| 92 | - var chartWrapper = new gv.Dashboard( chartWrapperElement ); | |
| 93 | - | |
| 94 | - // Error Handler. | |
| 95 | - gv.events.addListener(chartWrapper, 'error', function ( err ) { | |
| 96 | - if ( chartWrapperError.length === 0 ) { | |
| 97 | - chartWrapperError.push( err ); | |
| 98 | - gv.errors.removeError( err.id ); | |
| 99 | - var chartContainer = $( chartWrapperElement ).find( '.visualizer-front' ); | |
| 100 | - if ( chartContainer && chartContainer.is(':visible')) { | |
| 101 | - if (chartContainer.parents('div').next( '#sidebar' ).length === 0) { | |
| 102 | - chartContainer.addClass( 'visualizer-chart-loaded' ).addClass( 'visualizer-cw-error' ); | |
| 103 | - $( chartWrapperElement ).addClass( 'visualizer-cw-error' ); | |
| 104 | - } | |
| 105 | - } | |
| 106 | - } else { | |
| 107 | - gv.errors.removeError( err.id ); | |
| 108 | - } | |
| 109 | - } ); | |
| 110 | - } else { | |
| 111 | - render = new gv[render](container); | |
| 112 | - } | |
| 77 | + render = new gv[render](container); | |
| 113 | 78 | } |
| 114 | 79 | |
| 115 | 80 | if (settings['animation'] && parseInt(settings['animation']['startup']) === 1) |
| 116 | 81 | { |
| @@ -363,9 +328,8 @@ | ||
| 363 | 328 | override(settings); |
| 364 | 329 | |
| 365 | 330 | gv.events.addListener(render, 'ready', function () { |
| 366 | 331 | var arr = id.split('-'); |
| 367 | - render = typeof render.getChart !== 'undefined' ? render.getChart() : render; | |
| 368 | 332 | __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = ''; |
| 369 | 333 | |
| 370 | 334 | if (render.container && $(render.container).is(':visible')) { |
| 371 | 335 | if ($(render.container).parents('div').next( '#sidebar' ).length === 0) { |
| @@ -397,35 +361,10 @@ | ||
| 397 | 361 | }); |
| 398 | 362 | } |
| 399 | 363 | }); |
| 400 | 364 | |
| 401 | - if ( withControlMode ) { | |
| 402 | - // alert( chart.is_library_page ); | |
| 403 | - // Create a control wrapper, passing some options. | |
| 404 | - var controlWrapper = new gv.ControlWrapper( { | |
| 405 | - containerId: 'control_wrapper_' + id, | |
| 406 | - controlType: settings.controls.controlType, | |
| 407 | - 'options': settings.controls, | |
| 408 | - } ); | |
| 409 | - | |
| 410 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 411 | - render.setOptions(settings); | |
| 412 | - chartWrapper.bind(controlWrapper, render); | |
| 413 | - chartWrapper.draw(table); | |
| 414 | - | |
| 415 | - gv.events.addListener(controlWrapper, 'ready', function ( err ) { | |
| 416 | - if ( 'vertical' === settings.controls.ui.orientation ) { | |
| 417 | - if ( 'canvas' === id ) { | |
| 418 | - jQuery( '#' + id ).addClass( 'vz-vertical' ); | |
| 419 | - } | |
| 420 | - } else { | |
| 421 | - jQuery( '#' + id ).removeClass( 'vz-vertical' ); | |
| 422 | - } | |
| 423 | - }); | |
| 424 | - } else { | |
| 425 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 426 | - render.draw(table, settings); | |
| 427 | - } | |
| 365 | + $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 366 | + render.draw(table, settings); | |
| 428 | 367 | } |
| 429 | 368 | |
| 430 | 369 | function format_data(id, table, type, format, index) { |
| 431 | 370 | if (!format || format === '') { |
| @@ -569,10 +508,9 @@ | ||
| 569 | 508 | } |
| 570 | 509 | |
| 571 | 510 | objects = {}; |
| 572 | 511 | if ( 'object' === typeof google ) { |
| 573 | - $chart_types.push( 'controls' ); | |
| 574 | - google.load( 'visualization', '51', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language, | |
| 512 | + google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language, | |
| 575 | 513 | callback: function () { |
| 576 | 514 | gv = google.visualization; |
| 577 | 515 | all_charts = v.charts; |
| 578 | 516 | if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line |
