← All changes | js/render-google.js +8 -87 3.10.11 → 3.7.9 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
		@@ -379,9 +328,8 @@
379	328	override(settings);
380	329
381	330	gv.events.addListener(render, 'ready', function () {
382	331	var arr = id.split('-');
383		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
384	332	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
385	333
386	334	if (render.container && $(render.container).is(':visible')) {
387	335	if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
		@@ -413,35 +361,10 @@
413	361	});
414	362	}
415	363	});
416	364
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		- }
	365	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	366	+ render.draw(table, settings);
444	367	}
445	368
446	369	function format_data(id, table, type, format, index) {
447	370	if (!format || format === '') {
		@@ -492,11 +415,10 @@
492	415
493	416	var resizeTimeout;
494	417
495	418	$(document).ready(function() {
496		- $(window).resize(function(e) {
	419	+ $(window).resize(function() {
497	420	clearTimeout(resizeTimeout);
498		- window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false;
499	421	resizeTimeout = setTimeout(render, 100);
500	422	});
501	423
502	424	resizeHiddenContainers(true);
		@@ -586,10 +508,9 @@
586	508	}
587	509
588	510	objects = {};
589	511	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,
	512	+ google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
592	513	callback: function () {
593	514	gv = google.visualization;
594	515	all_charts = v.charts;
595	516	if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line