← All changes | js/render-google.js +23 -133 3.10.0 → 3.6.1 View file →

		@@ -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;
		@@ -20,14 +19,9 @@
20	19	// this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
21	20	// remember, some charts do not support annotations so they should not be included in this.
22	21	var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
23	22	if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) {
24		- var chartSeries = [];
25		- var chartSeriesValue = Object.values( chart.settings.series );
26		- $.each( Object.keys( chart.settings.series ), function( index, element ) {
27		- chartSeries[element] = chartSeriesValue[index];
28		- } );
29		- chart.settings.series = chartSeries;
	23	+ chart.settings.series = Object.values( chart.settings.series );
30	24	}
31	25	if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
32	26	hasAnnotation = chart.series.length - chart.settings.series.length > 1;
33	27	}
		@@ -39,12 +33,8 @@
39	33
40	34	function renderSpecificChart(id, chart) {
41	35	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
42	36
43		- if ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader)' ).length > 0 ) ) {
44		- return;
45		- }
46		-
47	37	if(chart.library !== 'google'){
48	38	return;
49	39	}
50	40	rendered_charts[id] = 'yes';
		@@ -74,43 +64,9 @@
74	64	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart';
75	65	break;
76	66	}
77	67
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		- }
	68	+ render = new gv[render](container);
113	69	}
114	70
115	71	if (settings['animation'] && parseInt(settings['animation']['startup']) === 1)
116	72	{
		@@ -261,12 +217,8 @@
261	217
262	218	delete axis.viewWindow[property];
263	219	}
264	220	}
265		-
266		- if(settings.hAxis && settings.hAxis.format == ''){
267		- settings.hAxis.format = 'yyyy-MM-dd';
268		- }
269	221	}
270	222
271	223	if(settings.hAxis){
272	224	if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){
		@@ -300,17 +252,9 @@
300	252	break;
301	253	case 'date':
302	254	// fall-through.
303	255	case 'datetime':
304		- if (typeof data[i][j] === 'string') {
305		- var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
306		- if ( isNaN( dateParse ) ) {
307		- dateParse = Date.parse(data[i][j]);
308		- }
309		- date = new Date( dateParse );
310		- } else if(typeof data[i][j] === 'object') {
311		- date = data[i][j];
312		- }
	256	+ date = new Date(data[i][j]);
313	257	data[i][j] = null;
314	258	if (Object.prototype.toString.call(date) === "[object Date]") {
315	259	if (!isNaN(date.getTime())) {
316	260	data[i][j] = date;
		@@ -363,25 +307,15 @@
363	307	override(settings);
364	308
365	309	gv.events.addListener(render, 'ready', function () {
366	310	var arr = id.split('-');
367		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
368	311	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
369		-
370		- if (render.container && $(render.container).is(':visible')) {
371		- if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
372		- $(render.container).addClass( 'visualizer-chart-loaded' );
373		- }
374		- }
375		-
376	312	try{
377		- if ( typeof render.getImageURI !== 'undefined' ) {
378		- var img = render.getImageURI();
379		- __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
380		- $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
381		- if ( $( '#chart-img' ).length ) {
382		- $( '#chart-img' ).val( img );
383		- }
	313	+ var img = render.getImageURI();
	314	+ __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
	315	+ $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
	316	+ if ( $( '#chart-img' ).length ) {
	317	+ $( '#chart-img' ).val( img );
384	318	}
385	319	}catch(error){
386	320	var canvas = document.getElementById( 'canvas' );
387	321	domtoimage.toPng(canvas)
		@@ -397,35 +331,10 @@
397	331	});
398	332	}
399	333	});
400	334
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		- }
	335	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	336	+ render.draw(table, settings);
428	337	}
429	338
430	339	function format_data(id, table, type, format, index) {
431	340	if (!format || format === '') {
		@@ -466,10 +375,9 @@
466	375	}
467	376
468	377	function render() {
469	378	for (var id in (all_charts || {})) {
470		- var chartElement = document.getElementById( id );
471		- if (chartElement && chartElement.offsetParent) {
	379	+ if (document.getElementById( id ).offsetParent !== null) {
472	380	renderChart(id);
473	381	}
474	382	}
475	383	}
		@@ -485,19 +393,14 @@
485	393	resizeHiddenContainers(true);
486	394
487	395	if ( $( '.visualizer-hidden-container' ).length ) {
488	396	setInterval( function() {
489		- $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize();
	397	+ $( '.visualizer-hidden-container' ).find(".visualizer-front").resize();
490	398	}, 500 );
491	399	}
492		-
493		- window.addEventListener( 'orientationchange', function() {
494		- $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize();
495		- }, false);
496	400	});
497	401
498	402	$(window).on('load', function(){
499		- $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
500	403	resizeHiddenContainers(true);
501	404	});
502	405
503	406	function resizeHiddenContainers(everytime){
		@@ -568,24 +471,21 @@
568	471	});
569	472	}
570	473
571	474	objects = {};
572		- 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,
575		- callback: function () {
576		- gv = google.visualization;
577		- all_charts = v.charts;
578		- if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
579		- if ( document.getElementById( v.id ).offsetParent !== null ) {
580		- renderChart(v.id);
581		- }
582		- } else {
583		- render();
	475	+ google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
	476	+ callback: function () {
	477	+ gv = google.visualization;
	478	+ all_charts = v.charts;
	479	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	480	+ if ( document.getElementById( v.id ).offsetParent !== null ) {
	481	+ renderChart(v.id);
584	482	}
	483	+ } else {
	484	+ render();
585	485	}
586		- });
587		- }
	486	+ }
	487	+ });
588	488	});
589	489
590	490	$('body').on('visualizer:render:specificchart:start', function(event, v){
591	491	objects = {};
		@@ -629,15 +529,5 @@
629	529	break;
630	530	}
631	531	});
632	532
633		- var timer = 0;
634		- $( document ).on( 'input', '.series-linewidth', function() {
635		- var seriesLineWidth = $( this );
636		- clearTimeout( timer );
637		- timer = setTimeout( function() {
638		- if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) {
639		- seriesLineWidth.val( '0.1' );
640		- }
641		- }, 700 );
642		- } );
643	533	})(jQuery);