← All changes | classes/Visualizer/Gutenberg/src/Components/Sidebar/SeriesSettings.js +11 -30 3.10.15 → 3.4.2 View file →

		@@ -59,27 +59,17 @@
59	59	>
60	60
61	61	{ Object.keys( settings.series )
62	62	.map( ( i, index ) => {
63		- i = parseInt( i ) + 1;
64		- let indexToFormat = parseInt( i );
65		- let label = 'object' === typeof series[i] ? series[i].label : '';
66		- let type = 'object' == typeof series[i] ? series[i].type : '';
67		- let timer = 0;
68		- if ( 'tabular' !== type ) {
69		- indexToFormat = index;
70		- }
71		-
72	63	i++;
73		-
74	64	return (
75	65	<PanelBody
76		- title={ label }
	66	+ title={ series[i].label }
77	67	className="visualizer-inner-sections"
78	68	initialOpen={ false }
79	69	>
80	70
81		- { ( -1 >= [ 'tabular', 'pie' ].indexOf( type ) ) && (
	71	+ { ( -1 >= [ 'table', 'pie' ].indexOf( type ) ) && (
82	72	<SelectControl
83	73	label={ __( 'Visible In Legend' ) }
84	74	help={ __( 'Determines whether the series has to be presented in the legend or not.' ) }
85	75	value={ settings.series[index].visibleInLegend ? settings.series[index].visibleInLegend : '1' }
		@@ -93,9 +83,9 @@
93	83	} }
94	84	/>
95	85	) }
96	86
97		- { ( -1 >= [ 'tabular', 'candlestick', 'combo', 'column', 'bar' ].indexOf( type ) ) && (
	87	+ { ( -1 >= [ 'table', 'candlestick', 'combo', 'column', 'bar' ].indexOf( type ) ) && (
98	88
99	89	<Fragment>
100	90
101	91	<TextControl
		@@ -105,17 +95,8 @@
105	95	onChange={ e => {
106	96	settings.series[index].lineWidth = e;
107	97	this.props.edit( settings );
108	98	} }
109		- onKeyUp={ e => {
110		- clearTimeout( timer );
111		- timer = setTimeout( () => {
112		- if ( '' != settings.series[index].lineWidth && 0 >= settings.series[index].lineWidth ) {
113		- settings.series[index].lineWidth = '0.1';
114		- this.props.edit( settings );
115		- }
116		- }, 700 );
117		- } }
118	99	/>
119	100
120	101	<TextControl
121	102	label={ __( 'Point Size' ) }
		@@ -132,9 +113,9 @@
132	113	) }
133	114
134	115	{ ( -1 >= [ 'candlestick' ].indexOf( type ) ) &&
135	116
136		- ( type && 'number' === type ) ? (
	117	+ ( 'number' === series[i].type ) ? (
137	118
138	119	<Fragment>
139	120
140	121	<TextControl
		@@ -139,11 +120,11 @@
139	120
140	121	<TextControl
141	122	label={ __( 'Format' ) }
142	123	help={ __( 'Enter custom format pattern to apply to this series value.' ) }
143		- value={ settings.series[indexToFormat].format }
	124	+ value={ settings.series[index].format }
144	125	onChange={ e => {
145		- settings.series[indexToFormat].format = e;
	126	+ settings.series[index].format = e;
146	127	this.props.edit( settings );
147	128	} }
148	129	/>
149	130
		@@ -158,9 +139,9 @@
158	139	</Fragment>
159	140
160	141	) :
161	142
162		- ( 0 <= [ 'date', 'datetime', 'timeofday' ].indexOf( type ) ) && (
	143	+ ( 'date' === series[i].type ) && (
163	144
164	145	<Fragment>
165	146
166	147	<TextControl
		@@ -166,11 +147,11 @@
166	147	<TextControl
167	148	label={ __( 'Date Format' ) }
168	149	help={ __( 'Enter custom format pattern to apply to this series value.' ) }
169	150	placeholder="dd LLLL yyyy"
170		- value={ settings.series[indexToFormat].format }
	151	+ value={ settings.series[index].format }
171	152	onChange={ e => {
172		- settings.series[indexToFormat].format = e;
	153	+ settings.series[index].format = e;
173	154	this.props.edit( settings );
174	155	} }
175	156	/>
176	157
		@@ -175,9 +156,9 @@
175	156	/>
176	157
177	158	<p>
178	159	{ __( 'This is a subset of the date formatting ' ) }
179		- <ExternalLink href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax">
	160	+ <ExternalLink href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax">
180	161	{ __( 'ICU date and time format.' ) }
181	162	</ExternalLink>
182	163	</p>
183	164
		@@ -239,9 +220,9 @@
239	220	/>
240	221
241	222	) }
242	223
243		- { ( -1 >= [ 'tabular' ].indexOf( type ) ) && (
	224	+ { ( -1 >= [ 'table' ].indexOf( type ) ) && (
244	225
245	226	<BaseControl
246	227	label={ __( 'Color' ) }
247	228	>