← All changes
|
classes/Visualizer/Gutenberg/src/Components/ChartRender.js
+1
-14
3.10.2
→
3.4.5
View file →
| @@ -6,9 +6,9 @@ | ||
| 6 | 6 | import DataTable from './DataTable.js'; |
| 7 | 7 | |
| 8 | 8 | import merge from 'merge'; |
| 9 | 9 | |
| 10 | -import { compact, formatDate, isValidJSON, formatData } from '../utils.js'; | |
| 10 | +import { compact, formatDate, isValidJSON } from '../utils.js'; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * WordPress dependencies |
| 14 | 14 | */ |
| @@ -35,11 +35,8 @@ | ||
| 35 | 35 | super( ...arguments ); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | render() { |
| 39 | - | |
| 40 | - let chartVersion = 'undefined' !== typeof google ? google.visualization.Version : 'current'; | |
| 41 | - | |
| 42 | 39 | let chart, footer; |
| 43 | 40 | |
| 44 | 41 | let data = formatDate( JSON.parse( JSON.stringify( this.props.chart ) ) ); |
| 45 | 42 | |
| @@ -60,14 +57,8 @@ | ||
| 60 | 57 | if ( data['visualizer-data-exploded']) { |
| 61 | 58 | footer = __( 'Annotations in this chart may not display here but they will display in the front end.' ); |
| 62 | 59 | } |
| 63 | 60 | |
| 64 | - if ( this.props.chart['visualizer-series'] && 0 <= [ 'date', 'datetime', 'timeofday' ].indexOf( this.props.chart['visualizer-series'][0].type ) ) { | |
| 65 | - if ( this.props.chart['visualizer-settings'] && ( this.props.chart['visualizer-settings'].hAxis && '' == this.props.chart['visualizer-settings'].hAxis.format ) ) { | |
| 66 | - this.props.chart['visualizer-settings'].hAxis.format = 'YYYY-MM-dd'; | |
| 67 | - } | |
| 68 | - } | |
| 69 | - | |
| 70 | 61 | return ( |
| 71 | 62 | <div className={ this.props.className }> |
| 72 | 63 | |
| 73 | 64 | { ( null !== this.props.chart ) && |
| @@ -96,9 +87,8 @@ | ||
| 96 | 87 | options={ data['visualizer-settings'] } |
| 97 | 88 | /> |
| 98 | 89 | ) : ( '' !== data['visualizer-data-exploded'] ? ( |
| 99 | 90 | <Chart |
| 100 | - chartVersion={ chartVersion } | |
| 101 | 91 | chartType={ chart } |
| 102 | 92 | rows={ data['visualizer-data'] } |
| 103 | 93 | columns={ data['visualizer-series'] } |
| 104 | 94 | options={ |
| @@ -106,13 +96,11 @@ | ||
| 106 | 96 | merge( compact( this.props.chart['visualizer-settings']), JSON.parse( this.props.chart['visualizer-settings'].manual ) ) : |
| 107 | 97 | compact( this.props.chart['visualizer-settings']) |
| 108 | 98 | } |
| 109 | 99 | height="500px" |
| 110 | - formatters={ formatData( data ) } | |
| 111 | 100 | /> |
| 112 | 101 | ) : ( |
| 113 | 102 | <Chart |
| 114 | - chartVersion={ chartVersion } | |
| 115 | 103 | chartType={ chart } |
| 116 | 104 | rows={ data['visualizer-data'] } |
| 117 | 105 | columns={ data['visualizer-series'] } |
| 118 | 106 | options={ |
| @@ -120,9 +108,8 @@ | ||
| 120 | 108 | merge( compact( this.props.chart['visualizer-settings']), JSON.parse( this.props.chart['visualizer-settings'].manual ) ) : |
| 121 | 109 | compact( this.props.chart['visualizer-settings']) |
| 122 | 110 | } |
| 123 | 111 | height="500px" |
| 124 | - formatters={ formatData( data ) } | |
| 125 | 112 | /> |
| 126 | 113 | ) ) } |
| 127 | 114 | |
| 128 | 115 | <div className="visualizer-settings__charts-footer"><sub> |