← All changes | js/render-google.js +48 -218 4.0.3 → 3.5.0 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,40 +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		- if ( chart.library && chart.library !== 'google' && chart.library !== 'GoogleCharts' ) {
30		- return;
31		- }
32		-
33	18	// re-render the chart only if it doesn't have annotations and it is on the front-end
34	19	// this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
35	20	// remember, some charts do not support annotations so they should not be included in this.
36	21	var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
37	22	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		- }
	23	+ chart.settings.series = Object.values( chart.settings.series );
49	24	}
50	25	if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
51	26	hasAnnotation = chart.series.length - chart.settings.series.length > 1;
52	27	}
		@@ -58,16 +33,11 @@
58	33
59	34	function renderSpecificChart(id, chart) {
60	35	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
61	36
62		- if( chart.library !== 'google' ) {
	37	+ if(chart.library !== 'google'){
63	38	return;
64	39	}
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	40	rendered_charts[id] = 'yes';
71	41
72	42	series = chart.series;
73	43	data = chart.data;
		@@ -94,43 +64,9 @@
94	64	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart';
95	65	break;
96	66	}
97	67
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		- }
	68	+ render = new gv[render](container);
133	69	}
134	70
135	71	if (settings['animation'] && parseInt(settings['animation']['startup']) === 1)
136	72	{
		@@ -136,13 +72,8 @@
136	72	{
137	73	settings['animation']['startup'] = true;
138	74	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
139	75	}
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	76
146	77	// mark roles for series that have specified a role
147	78	// and then remove them from future processing
148	79	// and also adjust the indices of the series array so that
		@@ -286,12 +217,8 @@
286	217
287	218	delete axis.viewWindow[property];
288	219	}
289	220	}
290		-
291		- if(settings.hAxis && settings.hAxis.format == ''){
292		- settings.hAxis.format = 'yyyy-MM-dd';
293		- }
294	221	}
295	222
296	223	if(settings.hAxis){
297	224	if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){
		@@ -325,17 +252,9 @@
325	252	break;
326	253	case 'date':
327	254	// fall-through.
328	255	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		- }
	256	+ date = new Date(data[i][j]);
338	257	data[i][j] = null;
339	258	if (Object.prototype.toString.call(date) === "[object Date]") {
340	259	if (!isNaN(date.getTime())) {
341	260	data[i][j] = date;
		@@ -360,16 +279,21 @@
360	279	format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
361	280	}
362	281	break;
363	282	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);
	283	+ for (i = 0; i < settings.series.length; i++) {
	284	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	285	+ continue;
	286	+ }
	287	+ var seriesIndexToUse = i + 1;
	288	+
	289	+ // if an annotation "swallowed" a series, use the following one.
	290	+ if(series_annotations.includes(i)){
	291	+ seriesIndexToUse++;
	292	+ }
	293	+ if ( series[seriesIndexToUse] ) {
	294	+ format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
	295	+ }
372	296	}
373	297	break;
374	298	}
375	299	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
		@@ -383,69 +307,21 @@
383	307	override(settings);
384	308
385	309	gv.events.addListener(render, 'ready', function () {
386	310	var arr = id.split('-');
387		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
388	311	__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	312	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		- }
	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});
405	316	}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		- });
	317	+ console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
418	318	}
419	319	});
420	320
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		- } );
	321	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
429	322
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		- }
	323	+ render.draw(table, settings);
448	324	}
449	325
450	326	function format_data(id, table, type, format, index) {
451	327	if (!format || format === '') {
		@@ -452,32 +328,21 @@
452	328	return;
453	329	}
454	330
455	331	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		- }
	332	+ switch (type) {
	333	+ case 'number':
	334	+ formatter = new gv.NumberFormat({pattern: format});
	335	+ break;
	336	+ case 'date':
	337	+ case 'datetime':
	338	+ case 'timeofday':
	339	+ formatter = new gv.DateFormat({pattern: format});
	340	+ break;
	341	+ }
470	342
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		- }
	343	+ if (formatter) {
	344	+ formatter.format(table, index);
480	345	}
481	346
482	347	var arr = id.split('-');
483	348	$('body').trigger('visualizer:format:chart', {id: parseInt(arr[1]), data: table, column: index});
		@@ -497,12 +362,9 @@
497	362	}
498	363
499	364	function render() {
500	365	for (var id in (all_charts || {})) {
501		- var chartElement = document.getElementById( id );
502		- if (chartElement && chartElement.offsetParent) {
503		- renderChart(id);
504		- }
	366	+ renderChart(id);
505	367	}
506	368	}
507	369
508	370	var resizeTimeout;
		@@ -507,29 +369,17 @@
507	369
508	370	var resizeTimeout;
509	371
510	372	$(document).ready(function() {
511		- $(window).resize(function(e) {
	373	+ $(window).resize(function() {
512	374	clearTimeout(resizeTimeout);
513		- window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false;
514	375	resizeTimeout = setTimeout(render, 100);
515	376	});
516	377
517	378	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	379	});
529	380
530	381	$(window).on('load', function(){
531		- $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
532	382	resizeHiddenContainers(true);
533	383	});
534	384
535	385	function resizeHiddenContainers(everytime){
		@@ -563,12 +413,8 @@
563	413	if(v.is_front == true){ // jshint ignore:line
564	414	// check what all chart types to load.
565	415	$chart_types = [];
566	416	$.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	417	var $type = c.type;
572	418	switch($type){
573	419	case 'bar':
574	420	case 'column':
		@@ -597,9 +443,9 @@
597	443	case 'radar':
598	444	$type = null;
599	445	break;
600	446	}
601		- if($type != null && $type !== ''){
	447	+ if($type != null){
602	448	$chart_types.push($type);
603	449	}
604	450	});
605	451	}
		@@ -604,24 +450,18 @@
604	450	});
605	451	}
606	452
607	453	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		- }
	454	+ google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
	455	+ google.charts.setOnLoadCallback(function() {
	456	+ gv = google.visualization;
	457	+ all_charts = v.charts;
	458	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	459	+ renderChart(v.id);
	460	+ } else {
	461	+ render();
	462	+ }
	463	+ });
624	464	});
625	465
626	466	$('body').on('visualizer:render:specificchart:start', function(event, v){
627	467	objects = {};
		@@ -665,15 +505,5 @@
665	505	break;
666	506	}
667	507	});
668	508
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	509	})(jQuery);