← All changes | js/render-google.js +25 -152 3.10.13 → 3.6.1 View file →

		@@ -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,31 +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	15	var chart = all_charts[id];
23	16	var hasAnnotation = false;
24	17
25		- if ( ! chart ) {
26		- return;
27		- }
28		-
29	18	// re-render the chart only if it doesn't have annotations and it is on the front-end
30	19	// this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
31	20	// remember, some charts do not support annotations so they should not be included in this.
32	21	var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
33	22	if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) {
34		- var chartSeries = [];
35		- var chartSeriesValue = Object.values( chart.settings.series );
36		- $.each( Object.keys( chart.settings.series ), function( index, element ) {
37		- chartSeries[element] = chartSeriesValue[index];
38		- } );
39		- chart.settings.series = chartSeries;
	23	+ chart.settings.series = Object.values( chart.settings.series );
40	24	}
41	25	if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
42	26	hasAnnotation = chart.series.length - chart.settings.series.length > 1;
43	27	}
		@@ -49,16 +33,11 @@
49	33
50	34	function renderSpecificChart(id, chart) {
51	35	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
52	36
53		- if( chart.library !== 'google' ) {
	37	+ if(chart.library !== 'google'){
54	38	return;
55	39	}
56		-
57		- // Bail if the chart is already rendered or is being rendered.
58		- if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) {
59		- return;
60		- }
61	40	rendered_charts[id] = 'yes';
62	41
63	42	series = chart.series;
64	43	data = chart.data;
		@@ -85,43 +64,9 @@
85	64	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart';
86	65	break;
87	66	}
88	67
89		- var controlWrapperElement = document.getElementById( "control_wrapper_" + id ) || null;
90		- var withControlMode = ( typeof settings.controls !== 'undefined' && '' !== settings.controls.controlType ) && controlWrapperElement ? true : false;
91		-
92		- if ( $( controlWrapperElement ).hasClass( 'no-filter' ) ) {
93		- withControlMode = false;
94		- }
95		- if ( withControlMode ) {
96		- // Chart wrapper.
97		- render = new gv.ChartWrapper({
98		- 'chartType': render,
99		- 'containerId': id,
100		- });
101		- // Chart dashboard wrapper.
102		- var chartWrapperElement = document.getElementById( "chart_wrapper_" + id ) || null;
103		- var chartWrapper = new gv.Dashboard( chartWrapperElement );
104		-
105		- // Error Handler.
106		- gv.events.addListener(chartWrapper, 'error', function ( err ) {
107		- if ( chartWrapperError.length === 0 ) {
108		- chartWrapperError.push( err );
109		- gv.errors.removeError( err.id );
110		- var chartContainer = $( chartWrapperElement ).find( '.visualizer-front' );
111		- if ( chartContainer && chartContainer.is(':visible')) {
112		- if (chartContainer.parents('div').next( '#sidebar' ).length === 0) {
113		- chartContainer.addClass( 'visualizer-chart-loaded' ).addClass( 'visualizer-cw-error' );
114		- $( chartWrapperElement ).addClass( 'visualizer-cw-error' );
115		- }
116		- }
117		- } else {
118		- gv.errors.removeError( err.id );
119		- }
120		- } );
121		- } else {
122		- render = new gv[render](container);
123		- }
	68	+ render = new gv[render](container);
124	69	}
125	70
126	71	if (settings['animation'] && parseInt(settings['animation']['startup']) === 1)
127	72	{
		@@ -127,13 +72,8 @@
127	72	{
128	73	settings['animation']['startup'] = true;
129	74	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
130	75	}
131		- if ( settings['controls'] ) {
132		- settings['controls']['ui']['allowMultiple'] = 'true' === settings['controls']['allowMultiple'] ? true : false;
133		- settings['controls']['ui']['allowTyping'] = 'true' === settings['controls']['allowTyping'] ? true : false;
134		- settings['controls']['ui']['showRangeValues'] = 'true' === settings['controls']['showRangeValues'] ? true : false;
135		- }
136	76
137	77	// mark roles for series that have specified a role
138	78	// and then remove them from future processing
139	79	// and also adjust the indices of the series array so that
		@@ -277,12 +217,8 @@
277	217
278	218	delete axis.viewWindow[property];
279	219	}
280	220	}
281		-
282		- if(settings.hAxis && settings.hAxis.format == ''){
283		- settings.hAxis.format = 'yyyy-MM-dd';
284		- }
285	221	}
286	222
287	223	if(settings.hAxis){
288	224	if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){
		@@ -316,17 +252,9 @@
316	252	break;
317	253	case 'date':
318	254	// fall-through.
319	255	case 'datetime':
320		- if (typeof data[i][j] === 'string') {
321		- var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
322		- if ( isNaN( dateParse ) ) {
323		- dateParse = Date.parse(data[i][j]);
324		- }
325		- date = new Date( dateParse );
326		- } else if(typeof data[i][j] === 'object') {
327		- date = data[i][j];
328		- }
	256	+ date = new Date(data[i][j]);
329	257	data[i][j] = null;
330	258	if (Object.prototype.toString.call(date) === "[object Date]") {
331	259	if (!isNaN(date.getTime())) {
332	260	data[i][j] = date;
		@@ -379,25 +307,15 @@
379	307	override(settings);
380	308
381	309	gv.events.addListener(render, 'ready', function () {
382	310	var arr = id.split('-');
383		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
384	311	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
385		-
386		- if (render.container && $(render.container).is(':visible')) {
387		- if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
388		- $(render.container).addClass( 'visualizer-chart-loaded' );
389		- }
390		- }
391		-
392	312	try{
393		- if ( typeof render.getImageURI !== 'undefined' ) {
394		- var img = render.getImageURI();
395		- __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
396		- $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
397		- if ( $( '#chart-img' ).length ) {
398		- $( '#chart-img' ).val( img );
399		- }
	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 );
400	318	}
401	319	}catch(error){
402	320	var canvas = document.getElementById( 'canvas' );
403	321	domtoimage.toPng(canvas)
		@@ -413,35 +331,10 @@
413	331	});
414	332	}
415	333	});
416	334
417		- if ( withControlMode ) {
418		- // alert( chart.is_library_page );
419		- // Create a control wrapper, passing some options.
420		- var controlWrapper = new gv.ControlWrapper( {
421		- containerId: 'control_wrapper_' + id,
422		- controlType: settings.controls.controlType,
423		- 'options': settings.controls,
424		- } );
425		-
426		- $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
427		- render.setOptions(settings);
428		- chartWrapper.bind(controlWrapper, render);
429		- chartWrapper.draw(table);
430		-
431		- gv.events.addListener(controlWrapper, 'ready', function ( err ) {
432		- if ( 'vertical' === settings.controls.ui.orientation ) {
433		- if ( 'canvas' === id ) {
434		- jQuery( '#' + id ).addClass( 'vz-vertical' );
435		- }
436		- } else {
437		- jQuery( '#' + id ).removeClass( 'vz-vertical' );
438		- }
439		- });
440		- } else {
441		- $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
442		- render.draw(table, settings);
443		- }
	335	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	336	+ render.draw(table, settings);
444	337	}
445	338
446	339	function format_data(id, table, type, format, index) {
447	340	if (!format || format === '') {
		@@ -482,10 +375,9 @@
482	375	}
483	376
484	377	function render() {
485	378	for (var id in (all_charts || {})) {
486		- var chartElement = document.getElementById( id );
487		- if (chartElement && chartElement.offsetParent) {
	379	+ if (document.getElementById( id ).offsetParent !== null) {
488	380	renderChart(id);
489	381	}
490	382	}
491	383	}
		@@ -492,11 +384,10 @@
492	384
493	385	var resizeTimeout;
494	386
495	387	$(document).ready(function() {
496		- $(window).resize(function(e) {
	388	+ $(window).resize(function() {
497	389	clearTimeout(resizeTimeout);
498		- window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false;
499	390	resizeTimeout = setTimeout(render, 100);
500	391	});
501	392
502	393	resizeHiddenContainers(true);
		@@ -502,19 +393,14 @@
502	393	resizeHiddenContainers(true);
503	394
504	395	if ( $( '.visualizer-hidden-container' ).length ) {
505	396	setInterval( function() {
506		- $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize();
	397	+ $( '.visualizer-hidden-container' ).find(".visualizer-front").resize();
507	398	}, 500 );
508	399	}
509		-
510		- window.addEventListener( 'orientationchange', function() {
511		- $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize();
512		- }, false);
513	400	});
514	401
515	402	$(window).on('load', function(){
516		- $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
517	403	resizeHiddenContainers(true);
518	404	});
519	405
520	406	function resizeHiddenContainers(everytime){
		@@ -585,24 +471,21 @@
585	471	});
586	472	}
587	473
588	474	objects = {};
589		- if ( 'object' === typeof google ) {
590		- $chart_types.push( 'controls' );
591		- google.load( 'visualization', '51', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
592		- callback: function () {
593		- gv = google.visualization;
594		- all_charts = v.charts;
595		- if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
596		- if ( document.getElementById( v.id ).offsetParent !== null ) {
597		- renderChart(v.id);
598		- }
599		- } else {
600		- 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);
601	482	}
	483	+ } else {
	484	+ render();
602	485	}
603		- });
604		- }
	486	+ }
	487	+ });
605	488	});
606	489
607	490	$('body').on('visualizer:render:specificchart:start', function(event, v){
608	491	objects = {};
		@@ -646,15 +529,5 @@
646	529	break;
647	530	}
648	531	});
649	532
650		- var timer = 0;
651		- $( document ).on( 'input', '.series-linewidth', function() {
652		- var seriesLineWidth = $( this );
653		- clearTimeout( timer );
654		- timer = setTimeout( function() {
655		- if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) {
656		- seriesLineWidth.val( '0.1' );
657		- }
658		- }, 700 );
659		- } );
660	533	})(jQuery);