← All changes
|
classes/Visualizer/Gutenberg/src/Components/Charts.js
+1
-7
3.10.15
→
3.5.0
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, formatData } 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"> |
| @@ -149,25 +147,21 @@ | ||
| 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 | 155 | formatters={ formatData( data ) } |
| 159 | - chartPackages={ googleChartPackages } | |
| 160 | 156 | /> |
| 161 | 157 | ) : ( |
| 162 | 158 | <Chart |
| 163 | - chartVersion={ chartVersion } | |
| 164 | 159 | chartType={ chart } |
| 165 | 160 | rows={ data['visualizer-data'] } |
| 166 | 161 | columns={ data['visualizer-series'] } |
| 167 | 162 | options={ filterCharts( data['visualizer-settings']) } |
| 168 | 163 | formatters={ formatData( data ) } |
| 169 | - chartPackages={ googleChartPackages } | |
| 170 | 164 | /> |
| 171 | 165 | ) ) } |
| 172 | 166 | |
| 173 | 167 | <div className="visualizer-settings__charts-footer"><sub> |