← All changes | js/render-google.js +19 -127 3.10.13 → 3.7.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,20 +11,11 @@
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'];
		@@ -49,14 +38,13 @@
49	38
50	39	function renderSpecificChart(id, chart) {
51	40	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
52	41
53		- if( chart.library !== 'google' ) {
	42	+ if ( $('#' + id).hasClass('visualizer-chart-loaded') ) {
54	43	return;
55	44	}
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 ) ) ) {
	45	+
	46	+ if(chart.library !== 'google'){
59	47	return;
60	48	}
61	49	rendered_charts[id] = 'yes';
62	50
		@@ -85,43 +73,9 @@
85	73	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart';
86	74	break;
87	75	}
88	76
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		- }
	77	+ render = new gv[render](container);
124	78	}
125	79
126	80	if (settings['animation'] && parseInt(settings['animation']['startup']) === 1)
127	81	{
		@@ -127,13 +81,8 @@
127	81	{
128	82	settings['animation']['startup'] = true;
129	83	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
130	84	}
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	85
137	86	// mark roles for series that have specified a role
138	87	// and then remove them from future processing
139	88	// and also adjust the indices of the series array so that
		@@ -277,12 +226,8 @@
277	226
278	227	delete axis.viewWindow[property];
279	228	}
280	229	}
281		-
282		- if(settings.hAxis && settings.hAxis.format == ''){
283		- settings.hAxis.format = 'yyyy-MM-dd';
284		- }
285	230	}
286	231
287	232	if(settings.hAxis){
288	233	if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){
		@@ -316,17 +261,9 @@
316	261	break;
317	262	case 'date':
318	263	// fall-through.
319	264	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		- }
	265	+ date = new Date(Date.parse(data[i][j].replace(/-/g, '/')));
329	266	data[i][j] = null;
330	267	if (Object.prototype.toString.call(date) === "[object Date]") {
331	268	if (!isNaN(date.getTime())) {
332	269	data[i][j] = date;
		@@ -379,9 +316,8 @@
379	316	override(settings);
380	317
381	318	gv.events.addListener(render, 'ready', function () {
382	319	var arr = id.split('-');
383		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
384	320	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
385	321
386	322	if (render.container && $(render.container).is(':visible')) {
387	323	if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
		@@ -413,35 +349,10 @@
413	349	});
414	350	}
415	351	});
416	352
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		- }
	353	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	354	+ render.draw(table, settings);
444	355	}
445	356
446	357	function format_data(id, table, type, format, index) {
447	358	if (!format || format === '') {
		@@ -492,11 +403,10 @@
492	403
493	404	var resizeTimeout;
494	405
495	406	$(document).ready(function() {
496		- $(window).resize(function(e) {
	407	+ $(window).resize(function() {
497	408	clearTimeout(resizeTimeout);
498		- window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false;
499	409	resizeTimeout = setTimeout(render, 100);
500	410	});
501	411
502	412	resizeHiddenContainers(true);
		@@ -505,16 +415,11 @@
505	415	setInterval( function() {
506	416	$( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize();
507	417	}, 500 );
508	418	}
509		-
510		- window.addEventListener( 'orientationchange', function() {
511		- $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize();
512		- }, false);
513	419	});
514	420
515	421	$(window).on('load', function(){
516		- $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
517	422	resizeHiddenContainers(true);
518	423	});
519	424
520	425	function resizeHiddenContainers(everytime){
		@@ -585,24 +490,21 @@
585	490	});
586	491	}
587	492
588	493	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();
	494	+ google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
	495	+ callback: function () {
	496	+ gv = google.visualization;
	497	+ all_charts = v.charts;
	498	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	499	+ if ( document.getElementById( v.id ).offsetParent !== null ) {
	500	+ renderChart(v.id);
601	501	}
	502	+ } else {
	503	+ render();
602	504	}
603		- });
604		- }
	505	+ }
	506	+ });
605	507	});
606	508
607	509	$('body').on('visualizer:render:specificchart:start', function(event, v){
608	510	objects = {};
		@@ -646,15 +548,5 @@
646	548	break;
647	549	}
648	550	});
649	551
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	552	})(jQuery);