← All changes | classes/Visualizer/Gutenberg/src/Components/Charts.js +2 -10 3.10.10 → 3.4.5 View file →

		@@ -4,9 +4,9 @@
4	4	import { Chart } from 'react-google-charts';
5	5
6	6	import DataTable from './DataTable.js';
7	7
8		-import { formatDate, filterCharts, formatData, googleChartPackages } from '../utils.js';
	8	+import { formatDate, filterCharts } from '../utils.js';
9	9
10	10	/**
11	11	* WordPress dependencies
12	12	*/
		@@ -73,10 +73,8 @@
73	73	}
74	74
75	75	render() {
76	76
77		- let chartVersion = 'undefined' !== typeof google ? google.visualization.Version : 'current';
78		-
79	77	const { charts, isBusy, chartsLoaded, perPage } = this.state;
80	78
81	79	return (
82	80	<div className="visualizer-settings__charts">
		@@ -133,9 +131,9 @@
133	131	footer = __( 'Annotations in this chart may not display here but they will display in the front end.' );
134	132	}
135	133
136	134	return (
137		- <div className="visualizer-settings__charts-single" data-chart-type={ chart } key={ `chart-${ charts[i].id }` }>
	135	+ <div className="visualizer-settings__charts-single" key={ `chart-${ charts[i].id }` }>
138	136
139	137	<div className="visualizer-settings__charts-title">
140	138	{ title }
141	139	</div>
		@@ -149,25 +147,19 @@
149	147	options={ data['visualizer-settings'] }
150	148	/>
151	149	) : ( '' !== data['visualizer-data-exploded'] ? (
152	150	<Chart
153		- chartVersion={ chartVersion }
154	151	chartType={ chart }
155	152	rows={ data['visualizer-data'] }
156	153	columns={ data['visualizer-series'] }
157	154	options={ filterCharts( data['visualizer-settings']) }
158		- formatters={ formatData( data ) }
159		- chartPackages={ googleChartPackages }
160	155	/>
161	156	) : (
162	157	<Chart
163		- chartVersion={ chartVersion }
164	158	chartType={ chart }
165	159	rows={ data['visualizer-data'] }
166	160	columns={ data['visualizer-series'] }
167	161	options={ filterCharts( data['visualizer-settings']) }
168		- formatters={ formatData( data ) }
169		- chartPackages={ googleChartPackages }
170	162	/>
171	163	) ) }
172	164
173	165	<div className="visualizer-settings__charts-footer"><sub>