← All changes | classes/Visualizer/Gutenberg/src/Components/Sidebar.js +7 -15 3.10.4 → 3.4.4 View file →

		@@ -1,9 +1,8 @@
1	1	/**
2	2	* External dependencies
3	3	*/
4	4	import GeneralSettings from './Sidebar/GeneralSettings.js';
5		-import InstanceSettings from './Sidebar/InstanceSettings.js';
6	5	import HorizontalAxisSettings from './Sidebar/HorizontalAxisSettings.js';
7	6	import VerticalAxisSettings from './Sidebar/VerticalAxisSettings.js';
8	7	import PieSettings from './Sidebar/PieSettings.js';
9	8	import ResidueSettings from './Sidebar/ResidueSettings.js';
		@@ -42,22 +41,19 @@
42	41
43	42	render() {
44	43
45	44	const type = this.props.chart['visualizer-chart-type'];
46		- const library = this.props.chart['visualizer-chart-library'];
47	45
48	46	return (
49	47	<Fragment>
50	48
51		- <InstanceSettings chart={ this.props.chart } attributes={ this.props.attributes } edit={ this.props.edit } />
52		-
53	49	<GeneralSettings chart={ this.props.chart } edit={ this.props.edit } />
54	50
55		- { ( -1 >= [ 'tabular', 'dataTable', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
	51	+ { ( -1 >= [ 'table', 'gauge', 'geo', 'pie', 'timeline', 'dataTable' ].indexOf( type ) ) && (
56	52	<HorizontalAxisSettings chart={ this.props.chart } edit={ this.props.edit } />
57	53	) }
58	54
59		- { ( -1 >= [ 'tabular', 'dataTable', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
	55	+ { ( -1 >= [ 'table', 'gauge', 'geo', 'pie', 'timeline', 'dataTable' ].indexOf( type ) ) && (
60	56	<VerticalAxisSettings chart={ this.props.chart } edit={ this.props.edit } />
61	57	) }
62	58
63	59	{ ( 0 <= [ 'pie' ].indexOf( type ) ) && (
		@@ -103,9 +99,9 @@
103	99	{ ( 0 <= [ 'timeline' ].indexOf( type ) ) && (
104	100	<TimelineSettings chart={ this.props.chart } edit={ this.props.edit } />
105	101	) }
106	102
107		- { ( 0 <= [ 'tabular', 'dataTable' ].indexOf( type ) ) && (
	103	+ { ( 0 <= [ 'table', 'dataTable' ].indexOf( type ) ) && (
108	104	<Fragment>
109	105
110	106	<TableSettings chart={ this.props.chart } edit={ this.props.edit } />
111	107
		@@ -117,16 +113,12 @@
117	113	{ ( 0 <= [ 'combo' ].indexOf( type ) ) && (
118	114	<ComboSettings chart={ this.props.chart } edit={ this.props.edit } />
119	115	) }
120	116
121		- { ( -1 >= [ 'timeline', 'bubble', 'gauge', 'geo', 'pie', 'tabular', 'dataTable' ].indexOf( type ) ) && (
	117	+ { ( -1 >= [ 'timeline', 'bubble', 'gauge', 'geo', 'pie', 'dataTable' ].indexOf( type ) ) && (
122	118	<SeriesSettings chart={ this.props.chart } edit={ this.props.edit } />
123	119	) }
124	120
125		- { ( 'tabular' === type && 'GoogleCharts' === library ) && (
126		- <SeriesSettings chart={ this.props.chart } edit={ this.props.edit } />
127		- ) }
128		-
129	121	{ ( 0 <= [ 'bubble' ].indexOf( type ) ) && (
130	122	<BubbleSettings chart={ this.props.chart } edit={ this.props.edit } />
131	123	) }
132	124
		@@ -134,19 +126,19 @@
134	126	{ ( 0 <= [ 'pie' ].indexOf( type ) ) && (
135	127	<SlicesSettings chart={ this.props.chart } edit={ this.props.edit } />
136	128	) }
137	129
138		- { ( 'DataTable' === library ) && (
	130	+ { ( 0 <= [ 'dataTable' ].indexOf( type ) ) && (
139	131	<ColumnSettings chart={ this.props.chart } edit={ this.props.edit } />
140	132	) }
141	133
142		- { ( 'DataTable' !== library ) && (
	134	+ { ( -1 >= [ 'dataTable' ].indexOf( type ) ) && (
143	135	<LayoutAndChartArea chart={ this.props.chart } edit={ this.props.edit } />
144	136	) }
145	137
146	138	<FrontendActions chart={ this.props.chart } edit={ this.props.edit } />
147	139
148		- { ( 'DataTable' !== library ) && (
	140	+ { ( -1 >= [ 'dataTable' ].indexOf( type ) ) && (
149	141	<ManualConfiguration chart={ this.props.chart } edit={ this.props.edit } />
150	142	) }
151	143	</Fragment>
152	144	);