← All changes | classes/Visualizer/Render/Sidebar/Google.php +24 -70 4.0.4 → 3.4.4 View file →

		@@ -58,9 +58,9 @@
58	58	$this->_library = 'google';
59	59	parent::__construct( $data );
60	60
61	61	$this->_legendPositions = array(
62		- '' => esc_html__( 'Default', 'visualizer' ),
	62	+ '' => '',
63	63	'left' => esc_html__( 'Left of the chart', 'visualizer' ),
64	64	'right' => esc_html__( 'Right of the chart', 'visualizer' ),
65	65	'top' => esc_html__( 'Above the chart', 'visualizer' ),
66	66	'bottom' => esc_html__( 'Below the chart', 'visualizer' ),
		@@ -66,17 +66,12 @@
66	66	'bottom' => esc_html__( 'Below the chart', 'visualizer' ),
67	67	'none' => esc_html__( 'Omit the legend', 'visualizer' ),
68	68	);
69	69
70		- $chart_type = $this->get_chart_type( false );
71		- if ( ! in_array( $chart_type, array( 'Pie' ), true ) ) {
	70	+ if ( ! in_array( $this->get_chart_type( false ), array( 'Pie' ), true ) ) {
72	71	$this->_legendPositions['in'] = esc_html__( 'Inside the chart', 'visualizer' );
73	72	}
74	73
75		- if ( in_array( $chart_type, array( 'Bubble' ), true ) ) {
76		- unset( $this->_legendPositions['left'] );
77		- }
78		-
79	74	$this->_alignments = array(
80	75	'' => '',
81	76	'start' => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ),
82	77	'center' => esc_html__( 'Centered in the allocated area', 'visualizer' ),
		@@ -81,8 +76,9 @@
81	76	'start' => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ),
82	77	'center' => esc_html__( 'Centered in the allocated area', 'visualizer' ),
83	78	'end' => esc_html__( 'Aligned to the end of the allocated area', 'visualizer' ),
84	79	);
	80	+
85	81	}
86	82
87	83	/**
88	84	* Registers additional hooks.
		@@ -97,17 +93,16 @@
97	93
98	94	/**
99	95	* Loads the assets.
100	96	*/
101		- public function load_google_assets( $deps, $is_frontend ) {
102		- wp_register_script( 'google-jsapi', '//www.gstatic.com/charts/loader.js', array(), null, true );
103		- wp_register_script( 'dom-to-image', VISUALIZER_ABSURL . 'js/lib/dom-to-image.min.js', array(), null, true );
	97	+ function load_google_assets( $deps, $is_frontend ) {
	98	+ wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	99	+ wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
104	100	wp_register_script(
105	101	'visualizer-render-google-lib',
106	102	VISUALIZER_ABSURL . 'js/render-google.js',
107	103	array(
108		- 'google-jsapi',
109		- 'dom-to-image',
	104	+ 'google-jsapi-old',
110	105	),
111	106	Visualizer_Plugin::VERSION,
112	107	true
113	108	);
		@@ -115,8 +110,9 @@
115	110	return array_merge(
116	111	$deps,
117	112	array( 'visualizer-render-google-lib' )
118	113	);
	114	+
119	115	}
120	116
121	117	/**
122	118	* Enqueue assets.
		@@ -121,10 +117,11 @@
121	117	/**
122	118	* Enqueue assets.
123	119	*/
124	120	public static function enqueue_assets( $deps = array() ) {
125		- wp_enqueue_script( 'visualizer-google-jsapi', '//www.gstatic.com/charts/loader.js', array(), null, true );
126		- wp_enqueue_script( 'visualizer-render-google-lib', VISUALIZER_ABSURL . 'js/render-google.js', array_merge( $deps, array( 'visualizer-google-jsapi' ) ), Visualizer_Plugin::VERSION, true );
	121	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	122	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	123	+ wp_enqueue_script( 'visualizer-render-google-lib', VISUALIZER_ABSURL . 'js/render-google.js', array_merge( $deps, array( 'visualizer-google-jsapi-old' ) ), Visualizer_Plugin::VERSION, true );
127	124	return 'visualizer-render-google-lib';
128	125	}
129	126
130	127	/**
		@@ -147,18 +144,10 @@
147	144	'emphasis' => esc_html__( 'Emphasis', 'visualizer' ),
148	145	'scope' => esc_html__( 'Scope', 'visualizer' ),
149	146	'style' => esc_html__( 'Style', 'visualizer' ),
150	147	'tooltip' => esc_html__( 'Tooltip', 'visualizer' ),
151		- 'interval' => esc_html__( 'Interval', 'visualizer' ),
152	148	),
153		- sprintf(
154		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag, %3$s - HTML link tag, %4$s - HTML closing link tag
155		- esc_html__( 'Determines whether the series has to be used for a special role as mentioned in %1$shere%2$s. You can view a few examples %3$shere%4$s.', 'visualizer' ),
156		- '<a href="https://developers.google.com/chart/interactive/docs/roles#what-roles-are-available" target="_blank">',
157		- '</a>',
158		- '<a href="https://docs.themeisle.com/article/1160-roles-for-series-visualizer" target="_blank">',
159		- '</a>'
160		- )
	149	+ sprintf( esc_html__( 'Determines whether the series has to be used for a special role as mentioned in %1$shere%2$s. You can view a few examples %3$shere%4$s.', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/roles#what-roles-are-available" target="_blank">', '</a>', '<a href="https://docs.themeisle.com/article/1160-roles-for-series-visualizer" target="_blank">', '</a>' )
161	150	);
162	151	}
163	152
164	153	/**
		@@ -180,9 +169,9 @@
180	169
181	170	self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false );
182	171	echo '<div class="viz-section-item">';
183	172	echo '<a class="more-info" href="javascript:;">[?]</a>';
184		- echo '<b>', esc_html__( 'Font Family And Size', 'visualizer' ), '</b>';
	173	+ echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>';
185	174
186	175	echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">';
187	176	echo '<tr>';
188	177	echo '<td class="viz-section-table-column">';
		@@ -215,17 +204,17 @@
215	204	self::_renderSectionStart( esc_html__( 'Legend', 'visualizer' ), false );
216	205	self::_renderSelectItem(
217	206	esc_html__( 'Position', 'visualizer' ),
218	207	'legend[position]',
219		- isset( $this->legend['position'] ) ? $this->legend['position'] : '',
	208	+ $this->legend['position'],
220	209	$this->_legendPositions,
221		- esc_html__( 'Sets the legend position relative to the chart.', 'visualizer' )
	210	+ esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' )
222	211	);
223	212
224	213	self::_renderSelectItem(
225	214	esc_html__( 'Alignment', 'visualizer' ),
226	215	'legend[alignment]',
227		- isset( $this->legend['alignment'] ) ? $this->legend['alignment'] : '',
	216	+ $this->legend['alignment'],
228	217	$this->_alignments,
229	218	esc_html__( 'Determines the alignment of the legend.', 'visualizer' )
230	219	);
231	220
		@@ -241,25 +230,9 @@
241	230	$this->_renderTooltipSettigns();
242	231	self::_renderSectionEnd();
243	232
244	233	$this->_renderAnimationSettings();
245		- self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
246		- self::_renderTextItem(
247		- esc_html__( 'License', 'visualizer' ),
248		- 'license',
249		- $this->license,
250		- ''
251		- );
252		- self::_renderTextItem(
253		- esc_html__( 'Creator', 'visualizer' ),
254		- 'creator',
255		- $this->creator,
256		- ''
257		- );
258		- self::_renderSectionEnd();
259	234
260		- self::_renderChartImageSettings();
261		-
262	235	do_action( 'visualizer_chart_settings', get_class( $this ), $this->_data, 'general', array( 'generic' => true ) );
263	236
264	237	self::_renderGroupEnd();
265	238	}
		@@ -306,8 +279,9 @@
306	279	esc_html__( 'The easing function applied to the animation.', 'visualizer' )
307	280	);
308	281
309	282	self::_renderSectionEnd();
	283	+
310	284	}
311	285
312	286	/**
313	287	* Renders tooltip settings section.
		@@ -321,14 +295,14 @@
321	295	esc_html__( 'Trigger', 'visualizer' ),
322	296	'tooltip[trigger]',
323	297	isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null,
324	298	array(
325		- '' => esc_html__( 'Default', 'visualizer' ),
	299	+ '' => '',
326	300	'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', 'visualizer' ),
327		- 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element.', 'visualizer' ),
	301	+ 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', 'visualizer' ),
328	302	'none' => esc_html__( 'The tooltip will not be displayed', 'visualizer' ),
329	303	),
330		- esc_html__( 'Controls when the tooltip appears.', 'visualizer' )
	304	+ esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', 'visualizer' )
331	305	);
332	306
333	307	self::_renderSelectItem(
334	308	esc_html__( 'Show Color Code', 'visualizer' ),
		@@ -372,9 +346,9 @@
372	346	echo '</div>';
373	347
374	348	echo '<div class="viz-section-delimiter"></div>';
375	349
376		- self::_renderSectionDescription( esc_html__( 'Set the chart\'s background color, border width, and border color.', 'visualizer' ) );
	350	+ self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) );
377	351
378	352	self::_renderTextItem(
379	353	esc_html__( 'Stroke Width', 'visualizer' ),
380	354	'backgroundColor[strokeWidth]',
		@@ -415,14 +389,12 @@
415	389
416	390	echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">';
417	391	echo '<tr>';
418	392	echo '<td class="viz-section-table-column">';
419		- $chartarea_left = isset( $this->chartArea['left'] ) ? $this->chartArea['left'] : '';
420		- echo '<input type="text" name="chartArea[left]" class="control-text" value="', $chartarea_left || '0' === $chartarea_left ? esc_attr( $chartarea_left ) : '', '" placeholder="20%">';
	393	+ echo '<input type="text" name="chartArea[left]" class="control-text" value="', $this->chartArea['left'] || $this->chartArea['left'] === '0' ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">';
421	394	echo '</td>';
422	395	echo '<td class="viz-section-table-column">';
423		- $chartarea_top = isset( $this->chartArea['top'] ) ? $this->chartArea['top'] : '';
424		- echo '<input type="text" name="chartArea[top]" class="control-text" value="', $chartarea_top || '0' === $chartarea_top ? esc_attr( $chartarea_top ) : '', '" placeholder="20%">';
	396	+ echo '<input type="text" name="chartArea[top]" class="control-text" value="', $this->chartArea['top'] || $this->chartArea['top'] === '0' ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">';
425	397	echo '</td>';
426	398	echo '</tr>';
427	399	echo '</table>';
428	400
		@@ -446,29 +418,11 @@
446	418	echo '</tr>';
447	419	echo '</table>';
448	420
449	421	echo '<p class="viz-section-description">';
450		- esc_html_e( 'Determines the width and height of the chart area.', 'visualizer' );
	422	+ esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' );
451	423	echo '</p>';
452	424	echo '</div>';
453	425	self::_renderSectionEnd();
454	426	self::_renderGroupEnd();
455		- }
456		-
457		- /**
458		- * Renders advanced settings and hidden inputs for programmatically-set keys
459		- * (e.g. the global-preset colors palette) that have no visible sidebar control.
460		- *
461		- * @access protected
462		- */
463		- protected function _renderAdvancedSettings(): void {
464		- parent::_renderAdvancedSettings();
465		-
466		- // @phpstan-ignore-next-line (property accessed via magic __get from _data array)
467		- $colors = $this->colors;
468		- if ( ! empty( $colors ) && is_array( $colors ) ) {
469		- foreach ( $colors as $color ) {
470		- echo '<input type="hidden" name="colors[]" value="', esc_attr( $color ), '">';
471		- }
472		- }
473	427	}
474	428	}