← All changes
|
classes/Visualizer/Gutenberg/src/Components/ChartSelect.js
+2
-9
3.10.11
→
3.4.5
View file →
| @@ -22,9 +22,9 @@ | ||
| 22 | 22 | import PanelButton from './PanelButton.js'; |
| 23 | 23 | |
| 24 | 24 | import merge from 'merge'; |
| 25 | 25 | |
| 26 | -import { compact, formatDate, isValidJSON, formatData, googleChartPackages } from '../utils.js'; | |
| 26 | +import { compact, formatDate, isValidJSON } from '../utils.js'; | |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * WordPress dependencies |
| 30 | 30 | */ |
| @@ -55,9 +55,8 @@ | ||
| 55 | 55 | }; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | render() { |
| 59 | - let chartVersion = 'undefined' !== typeof google.visualization ? google.visualization.Version : 'current'; | |
| 60 | 59 | |
| 61 | 60 | let chart, footer; |
| 62 | 61 | |
| 63 | 62 | let data = formatDate( JSON.parse( JSON.stringify( this.props.chart ) ) ); |
| @@ -147,9 +146,9 @@ | ||
| 147 | 146 | } |
| 148 | 147 | </InspectorControls> |
| 149 | 148 | } |
| 150 | 149 | |
| 151 | - <div className="visualizer-settings__chart" data-chart-type={ chart }> | |
| 150 | + <div className="visualizer-settings__chart"> | |
| 152 | 151 | |
| 153 | 152 | { ( null !== this.props.chart ) && |
| 154 | 153 | |
| 155 | 154 | ( 'DataTable' === data['visualizer-chart-library']) ? ( |
| @@ -160,9 +159,8 @@ | ||
| 160 | 159 | options={ data['visualizer-settings'] } |
| 161 | 160 | /> |
| 162 | 161 | ) : ( '' !== data['visualizer-data-exploded'] ? ( |
| 163 | 162 | <Chart |
| 164 | - chartVersion={ chartVersion } | |
| 165 | 163 | chartType={ chart } |
| 166 | 164 | rows={ data['visualizer-data'] } |
| 167 | 165 | columns={ data['visualizer-series'] } |
| 168 | 166 | options={ |
| @@ -170,14 +168,11 @@ | ||
| 170 | 168 | merge( compact( this.props.chart['visualizer-settings']), JSON.parse( this.props.chart['visualizer-settings'].manual ) ) : |
| 171 | 169 | compact( this.props.chart['visualizer-settings']) |
| 172 | 170 | } |
| 173 | 171 | height="500px" |
| 174 | - formatters={ formatData( data ) } | |
| 175 | - chartPackages={ googleChartPackages } | |
| 176 | 172 | /> |
| 177 | 173 | ) : ( |
| 178 | 174 | <Chart |
| 179 | - chartVersion={ chartVersion } | |
| 180 | 175 | chartType={ chart } |
| 181 | 176 | rows={ data['visualizer-data'] } |
| 182 | 177 | columns={ data['visualizer-series'] } |
| 183 | 178 | options={ |
| @@ -185,10 +180,8 @@ | ||
| 185 | 180 | merge( compact( this.props.chart['visualizer-settings']), JSON.parse( this.props.chart['visualizer-settings'].manual ) ) : |
| 186 | 181 | compact( this.props.chart['visualizer-settings']) |
| 187 | 182 | } |
| 188 | 183 | height="500px" |
| 189 | - formatters={ formatData( data ) } | |
| 190 | - chartPackages={ googleChartPackages } | |
| 191 | 184 | /> |
| 192 | 185 | ) |
| 193 | 186 | ) } |
| 194 | 187 | |