← All changes | classes/Visualizer/Module/Frontend.php +69 -417 3.10.2 → 3.3.4 View file →

		@@ -41,16 +41,8 @@
41	41	*/
42	42	private $_charts = array();
43	43
44	44	/**
45		- * Lazy render script.
46		- *
47		- * @access private
48		- * @var bool
49		- */
50		- private $lazy_render_script = false;
51		-
52		- /**
53	45	* Constructor.
54	46	*
55	47	* @since 1.0.0
56	48	* @uses add_filter() To add "do_shortcode" hook for "widget_text" and "term_description" filters.
		@@ -60,12 +52,9 @@
60	52	*/
61	53	public function __construct( Visualizer_Plugin $plugin ) {
62	54	parent::__construct( $plugin );
63	55
64		- $this->_addAction( 'wp_print_footer_scripts', 'printFooterScripts' );
65	56	$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
66		- $this->_addAction( 'load-index.php', 'enqueueScripts' );
67		- $this->_addAction( 'load-visualizer_page_visualizer-setup-wizard', 'enqueueScripts' );
68	57	$this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' );
69	58	$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
70	59	$this->_addShortcode( 'visualizer', 'renderChart' );
71	60
		@@ -90,34 +79,16 @@
90	79	function script_loader_tag( $tag, $handle, $src ) {
91	80	if ( is_admin() ) {
92	81	return $tag;
93	82	}
94		- // Async scripts.
95		- $async_scripts = array( 'google-jsapi', 'chartjs', 'visualizer-datatables' );
96		- foreach ( $async_scripts as $async ) {
	83	+
	84	+ $scripts = array( 'google-jsapi-new', 'google-jsapi-old', 'visualizer-render-google-lib', 'visualizer-render-google' );
	85	+
	86	+ foreach ( $scripts as $async ) {
97	87	if ( $async === $handle ) {
98		- $tag = str_replace( ' src', ' async src', $tag );
	88	+ $tag = str_replace( ' src', ' defer="defer" src', $tag );
99	89	break;
100	90	}
101		- };
102		-
103		- // Async scripts.
104		- $scripts = array( 'dom-to-image' );
105		- foreach ( array( 'async', 'defer' ) as $attr ) {
106		- if ( wp_scripts()->get_data( $handle, $attr ) ) {
107		- break;
108		- }
109		- if ( in_array( $handle, $async_scripts, true ) || false === strpos( $handle, 'visualizer-' ) ) {
110		- break;
111		- }
112		- if ( ! preg_match( ":\s$attr(=|>|\s):", $tag ) ) {
113		- $tag = preg_replace( ':(?=></script>):', " $attr", $tag, 1 );
114		- if ( $this->lazy_render_script ) {
115		- $tag = str_replace( ' src', ' data-visualizer-script', $tag );
116		- }
117		- }
118		- // Only allow async or defer, not both.
119		- break;
120	91	}
121	92	return $tag;
122	93	}
123	94
		@@ -136,33 +107,9 @@
136	107	register_rest_route(
137	108	'visualizer/v' . VISUALIZER_REST_VERSION,
138	109	'/action/(?P<chart>\d+)/(?P<type>.+)/',
139	110	array(
140		- // POST is required for save/cancel, GET for all others
141		- 'methods' => array( 'POST', 'GET' ),
142		- 'args' => array(
143		- 'chart' => array(
144		- 'required' => true,
145		- 'sanitize_callback' => function( $param ) {
146		- return is_numeric( $param ) ? $param : null;
147		- },
148		- ),
149		- 'type' => array(
150		- 'required' => true,
151		- 'type' => 'string',
152		- 'enum' => array_merge( array( 'save', 'cancel' ), array_keys( $this->get_actions() ) ),
153		- ),
154		- ),
155		- 'permission_callback' => function ( WP_REST_Request $request ) {
156		- $chart_id = filter_var( sanitize_text_field( $request->get_param( 'chart' ), FILTER_VALIDATE_INT ) );
157		- if ( ! empty( $chart_id ) && in_array( $request->get_param( 'type' ), array( 'save', 'cancel' ), true ) ) {
158		- // let save and cancel go without any check as past version of pro
159		- // did not send the X-WP-Nonce
160		- // we can change this at a later date.
161		- return true;
162		- }
163		- return ! empty( $chart_id ) && apply_filters( 'visualizer_pro_show_chart', true, $chart_id );
164		- },
	111	+ 'methods' => array( 'GET', 'POST' ),
165	112	'callback' => array( $this, 'perform_action' ),
166	113	)
167	114	);
168	115	}
		@@ -172,42 +119,17 @@
172	119	*
173	120	* @access private
174	121	*/
175	122	private function get_actions() {
176		- $actions = apply_filters(
	123	+ return apply_filters(
177	124	'visualizer_action_buttons',
178	125	array(
179		- 'print' => array(
180		- 'label' => esc_html__( 'Print', 'visualizer' ),
181		- 'title' => esc_html__( 'Print Chart', 'visualizer' ),
182		- ),
183		- 'csv' => array(
184		- 'label' => esc_html__( 'CSV', 'visualizer' ),
185		- 'title' => esc_html__( 'Download as a CSV', 'visualizer' ),
186		- ),
187		- 'xls' => array(
188		- 'label' => esc_html__( 'Excel', 'visualizer' ),
189		- 'title' => esc_html__( 'Download as a spreadsheet', 'visualizer' ),
190		- ),
191		- 'copy' => array(
192		- 'label' => esc_html__( 'Copy', 'visualizer' ),
193		- 'title' => esc_html__( 'Copy data', 'visualizer' ),
194		- ),
195		- 'image' => array(
196		- 'label' => esc_html__( 'Download', 'visualizer' ),
197		- 'title' => esc_html__( 'Download as an image', 'visualizer' ),
198		- ),
	126	+ 'print' => __( 'Print', 'visualizer' ),
	127	+ 'csv' => __( 'CSV', 'visualizer' ),
	128	+ 'xls' => __( 'Excel', 'visualizer' ),
	129	+ 'copy' => __( 'Copy', 'visualizer' ),
199	130	)
200	131	);
201		-
202		- // backward compatibility before label and title attributes were introduced.
203		- if ( isset( $actions['edit'] ) && is_string( $actions['edit'] ) ) {
204		- $actions['edit'] = array(
205		- 'label' => esc_html__( 'Edit', 'visualizer' ),
206		- 'title' => esc_html__( 'Edit data', 'visualizer' ),
207		- );
208		- }
209		- return $actions;
210	132	}
211	133
212	134	/**
213	135	* The print button
		@@ -238,23 +160,8 @@
238	160	break;
239	161	case 'xls':
240	162	$data = $this->_getDataAs( $chart_id, 'xls' );
241	163	break;
242		- case 'image':
243		- $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
244		- $title = 'visualizer#' . $chart_id;
245		- if ( ! empty( $settings['title'] ) ) {
246		- $title = $settings['title'];
247		- }
248		- // for ChartJS, title is an array.
249		- if ( is_array( $title ) && isset( $title['text'] ) ) {
250		- $title = $title['text'];
251		- }
252		- if ( empty( $title ) ) {
253		- $title = 'visualizer#' . $chart_id;
254		- }
255		- $data = array( 'name' => $title );
256		- break;
257	164	default:
258	165	$data = apply_filters( 'visualizer_action_data', $data, $chart_id, $type, $params, $this );
259	166	break;
260	167	}
		@@ -271,8 +178,10 @@
271	178	* @access public
272	179	*/
273	180	public function enqueueScripts() {
274	181	wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	182	+ wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
	183	+ wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
275	184	do_action( 'visualizer_pro_frontend_load_resources' );
276	185	}
277	186
278	187	/**
		@@ -291,57 +200,26 @@
291	200	public function renderChart( $atts ) {
292	201	global $wp_version;
293	202	$atts = shortcode_atts(
294	203	array(
295		- // chart id
296		- 'id' => false,
297		- // chart class
298		- 'class' => false,
299		- // for lazy load
300		- // set 'yes' to use the default intersection limit (300px)
301		- // OR set a number (e.g. 700) to use 700px as the intersection limit
302		- 'lazy' => apply_filters( 'visualizer_lazy_by_default', false, $atts['id'] ),
303		- // Use image chart
304		- 'use_image' => 'no',
	204	+ 'id' => false, // chart id
	205	+ 'class' => false, // chart class
	206	+ 'series' => false, // series filter hook
	207	+ 'data' => false, // data filter hook
	208	+ 'settings' => false, // data filter hook
305	209	),
306	210	$atts
307	211	);
308	212
309		- $atts['id'] = (int) $atts['id'];
310		- $atts['class'] = esc_attr( $atts['class'] );
311		- $atts['lazy'] = esc_attr( $atts['lazy'] );
312		- $atts['use_image'] = esc_attr( $atts['use_image'] );
313		-
314		- global $sitepress;
315		- if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
316		- global $sitepress;
317		- $locale = icl_get_current_language();
318		- $locale = strtolower( str_replace( '_', '-', $locale ) );
319		- $trid = $sitepress->get_element_trid( $atts['id'], 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
320		- $translations = $sitepress->get_element_translations( $trid );
321		- if ( isset( $translations[ $locale ] ) && is_object( $translations[ $locale ] ) ) {
322		- $atts['id'] = $translations[ $locale ]->element_id;
323		- }
324		- }
325		-
326		- $chart_data = $this->getChartData( Visualizer_Plugin::CF_CHART_CACHE, $atts['id'] );
327		- // if empty chart does not exists, then return empty string.
328		- if ( ! $chart_data ) {
	213	+ // if empty id or chart does not exists, then return empty string
	214	+ if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
329	215	return '';
330	216	}
331	217
332		- $chart = $chart_data['chart'];
333		- $type = $chart_data['type'];
334		- $series = $chart_data['series'];
335		- // do not show the chart?
336	218	if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
337	219	return '';
338	220	}
339	221
340		- if ( ! is_admin() && ! empty( $chart_data['is_woocommerce_report'] ) ) {
341		- return '';
342		- }
343		-
344	222	// in case revisions exist.
345	223	// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
346	224	if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
347	225	$chart = get_post( $chart->ID );
		@@ -349,48 +227,37 @@
349	227
350	228	$id = 'visualizer-' . $atts['id'];
351	229	$defaultClass = 'visualizer-front';
352	230	$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
	231	+ $class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id'];
	232	+ $class = ! empty( $class ) ? ' class="' . trim( $class ) . '"' : '';
353	233
354		- $lazyClass = $atts['lazy'] === 'yes' || ctype_digit( $atts['lazy'] ) ? 'visualizer-lazy' : '';
	234	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
355	235
356		- $class = sprintf( '%s %s %s %s', $defaultClass, $class, 'visualizer-front-' . $atts['id'], $lazyClass );
357		- $attributes = array();
358		- if ( ! empty( $class ) ) {
359		- $attributes['class'] = trim( $class );
360		- }
361		-
362		- if ( ctype_digit( $atts['lazy'] ) ) {
363		- $attributes['data-lazy-limit'] = $atts['lazy'];
364		- }
365		-
366		- $attributes = apply_filters( 'visualizer_container_attributes', $attributes, $chart->ID );
367		-
368	236	$chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
369	237
370		- // Get and update settings.
371		- $settings = $chart_data['settings'];
372		- $settings = ! empty( $settings ) ? $settings : array();
	238	+ // fetch and update settings
	239	+ $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
373	240	if ( empty( $settings['height'] ) ) {
374	241	$settings['height'] = '400';
375	242	}
376	243
377	244	// handle series filter hooks
378		- $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, $series, $chart->ID, $type );
379		-
	245	+ $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
	246	+ if ( ! empty( $atts['series'] ) ) {
	247	+ $series = apply_filters( $atts['series'], $series, $chart->ID, $type );
	248	+ }
380	249	// handle settings filter hooks
381	250	$settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
382		-
383		- $lazy_load = isset( $settings['lazy_load_chart'] ) ? $settings['lazy_load_chart'] : false;
384		- $lazy_load = apply_filters( 'visualizer_lazy_load_chart', $lazy_load, $chart->ID );
385		- $container_class = 'visualizer-front-container';
386		- if ( $lazy_load ) {
387		- $this->lazy_render_script = true;
388		- $container_class .= ' visualizer-lazy-render';
	251	+ if ( ! empty( $atts['settings'] ) ) {
	252	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
389	253	}
390	254
391	255	// handle data filter hooks
392		- $data = self::get_chart_data( $chart, $type );
	256	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	257	+ if ( ! empty( $atts['data'] ) ) {
	258	+ $data = apply_filters( $atts['data'], $data, $chart->ID, $type );
	259	+ }
393	260
394	261	$css = '';
395	262	$arguments = $this->get_inline_custom_css( $id, $settings );
396	263	if ( ! empty( $arguments ) ) {
		@@ -403,35 +270,11 @@
403	270	$id = $id . '-' . rand();
404	271
405	272	$amp = Visualizer_Plugin::instance()->getModule( Visualizer_Module_AMP::NAME );
406	273	if ( $amp && $amp->is_amp() ) {
407		- return '<div data-amp-auto-lightbox-disable id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '>' . $amp->get_chart( $chart, $data, $series, $settings ) . '</div>';
	274	+ return '<div id="' . $id . '"' . $class . '>' . $amp->get_chart( $chart, $data, $series, $settings ) . '</div>';
408	275	}
409	276
410		- if ( 'yes' === $atts['use_image'] ) {
411		- $chart_image = $chart_data['chart_image'];
412		- if ( $chart_image ) {
413		- return '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '>' . wp_get_attachment_image( $chart_image, 'full' ) . '</div>';
414		- }
415		- }
416		- // Unset chart image base64 string.
417		- if ( isset( $settings['chart-img'] ) ) {
418		- unset( $settings['chart-img'] );
419		- }
420		-
421		- $enable_controls = false;
422		- if ( isset( $settings['controls'] ) && ! empty( $settings['controls']['controlType'] ) ) {
423		- $column_index = $settings['controls']['filterColumnIndex'];
424		- $column_label = $settings['controls']['filterColumnLabel'];
425		- if ( 'false' !== $column_index || 'false' !== $column_label ) {
426		- $enable_controls = true;
427		- }
428		- }
429		-
430		- if ( ! $enable_controls ) {
431		- unset( $settings['controls'] );
432		- }
433		-
434	277	// add chart to the array
435	278	$this->_charts[ $id ] = array(
436	279	'type' => $type,
437	280	'series' => $series,
		@@ -452,16 +295,15 @@
452	295	$array = explode( ';', $action_type );
453	296	$key = $array[0];
454	297	$mime = end( $array );
455	298	}
456		- $label = $actions[ $key ]['label'];
457		- $title = $actions[ $key ]['title'];
458		- $actions_div .= sprintf( '<a href="#" class="visualizer-action visualizer-action-%s" data-visualizer-type="%s" data-visualizer-chart-id="%s" data-visualizer-container-id="%s" data-visualizer-mime="%s" title="%s"', $key, $key, $atts['id'], $id, $mime, $title );
	299	+ $label = $actions[ $key ];
	300	+ $actions_div .= '<a href="#" class="visualizer-action visualizer-action-' . $key . '" data-visualizer-type="' . $key . '" data-visualizer-chart-id="' . $atts['id'] . '" data-visualizer-container-id="' . $id . '" data-visualizer-mime="' . $mime . '" title="' . $label . '" ';
459	301
460	302	if ( 'copy' === $key ) {
461	303	$copy = $this->_getDataAs( $atts['id'], 'csv' );
462	304	$actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"';
463		- wp_enqueue_script( 'clipboard' );
	305	+ wp_enqueue_script( 'visualizer-clipboardjs' );
464	306	}
465	307
466	308	$actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] );
467	309	$actions_div .= '>' . $label . '</a> &nbsp;';
		@@ -471,77 +313,42 @@
471	313	}
472	314
473	315	$actions_div .= $css;
474	316
475		- $_charts = array();
476		- $_charts_type = '';
477		- $count = 0;
478		- foreach ( $this->_charts as $id => $array ) {
479		- $_charts = $this->_charts;
480		- $library = $array['library'];
481		- $_charts_type = $library;
482		- if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) {
483		- wp_register_script(
484		- "visualizer-render-$library",
485		- VISUALIZER_ABSURL . 'js/render-facade.js',
486		- apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
487		- Visualizer_Plugin::VERSION,
488		- true
489		- );
490		- wp_enqueue_script( "visualizer-render-$library" );
491		- }
	317	+ foreach ( $this->_charts as $id => $attributes ) {
	318	+ $library = $attributes['library'];
	319	+ wp_register_script(
	320	+ "visualizer-render-$library",
	321	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	322	+ apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
	323	+ Visualizer_Plugin::VERSION,
	324	+ true
	325	+ );
492	326
493		- if ( wp_script_is( "visualizer-render-$_charts_type" ) && 0 === $count ) {
494		- wp_localize_script(
495		- "visualizer-render-$_charts_type",
496		- 'visualizer',
497		- array(
498		- 'charts' => $this->_charts,
499		- 'language' => $this->get_language(),
500		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
501		- 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
502		- 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
503		- 'i10n' => array(
504		- 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
505		- ),
506		- 'page_type' => 'frontend',
507		- 'is_front' => true,
508		- )
509		- );
510		- }
511		- $count++;
	327	+ wp_enqueue_script( "visualizer-render-$library" );
	328	+ wp_localize_script(
	329	+ "visualizer-render-$library",
	330	+ 'visualizer',
	331	+ array(
	332	+ 'charts' => $this->_charts,
	333	+ 'language' => $this->get_language(),
	334	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
	335	+ 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
	336	+ 'i10n' => array(
	337	+ 'copied' => __( 'Copied!', 'visualizer' ),
	338	+ ),
	339	+ 'page_type' => 'frontend',
	340	+ 'is_front' => true,
	341	+ )
	342	+ );
	343	+ wp_enqueue_style( 'visualizer-front' );
512	344	}
513		- $prefix = 'C' . 'h' . 'a' . 'rt';
514		- if ( $type === 'tabular' ) {
515		- $prefix = 'T' . 'a' . 'bl' . 'e';
516		- }
517		- if ( Visualizer_Module::is_pro() && $enable_controls ) {
518		- $actions_div .= '<div id="control_wrapper_' . $id . '"></div>';
519		- }
	345	+
520	346	// return placeholder div
521		- return '<div class="' . $container_class . '" id="chart_wrapper_' . $id . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . ( ! Visualizer_Module::is_pro() ? ( '<' . 'di' . 'v st' . 'yl' . 'e="' . 'op' . 'a' . 'ci' . 't' . 'y:' . '0' . '.7' . ';t' . 'ex' . 't-a' . 'li' . 'gn:' . 'ri' . 'gh' . 't;b' . 'o' . 'tto' . 'm: 1' . '0px; z-i' . 'nd' . 'ex:1' . '00' . '0; ' . 'le' . 'ft' . ':2' . '0px' . '; fo' . 'nt-si' . 'ze: 1' . '4px">' . $prefix . ' b' . 'y' . ' <a ' . 'h' . 're' . 'f="ht' . 'tp' . 's:/' . '/t' . 'he' . 'me' . 'i' . 'sl' . 'e' . '.c' . 'om' . '/p' . 'lu' . 'gi' . 'ns' . '/v' . 'i' . 'su' . 'al' . 'iz' . 'er' . '-c' . 'ha' . 'rts' . '-a' . 'nd' . '-gr' . 'ap' . 'hs' . '/" t' . 'arg' . 'et="' . '_bl' . 'an' . 'k" re' . 'l=' . '"no' . 'fol' . 'l' . 'ow"' . '>V' . 'is' . 'u' . 'a' . 'l' . 'i' . 'z' . 'e' . 'r' . '</' . 'a' . '>' . '<' . '/' . 'd' . 'i' . 'v' . '>' ) : '' ) . '</div>';
	347	+ return $actions_div . '<div id="' . $id . '"' . $class . '></div>' . $this->addSchema( $chart->ID );
522	348	}
523	349
524	350	/**
525		- * Converts the array of attributes to a string of HTML attributes.
526		- *
527		- * @since ?
528		- *
529		- * @access private
530		- */
531		- private function getHtmlAttributes( $attributes ) {
532		- $string = '';
533		- if ( ! $attributes ) {
534		- return $string;
535		- }
536		-
537		- foreach ( $attributes as $name => $value ) {
538		- $string .= sprintf( ' %s="%s"', esc_attr( $name ), esc_attr( $value ) );
539		- }
540		- return $string;
541		- }
542		-
543		- /**
544	351	* Adds the schema corresponding to the dataset.
545	352	*
546	353	* @since 3.3.2
547	354	*
		@@ -547,11 +354,8 @@
547	354	*
548	355	* @access private
549	356	*/
550	357	private function addSchema( $id ) {
551		- // should we show informative errors as HTML comments?
552		- $show_errors = apply_filters( 'visualizer_schema_show_errors', true, $id );
553		-
554	358	$settings = get_post_meta( $id, Visualizer_Plugin::CF_SETTINGS, true );
555	359	$title = '';
556	360	if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
557	361	$title = $settings['title'];
		@@ -560,11 +364,8 @@
560	364	}
561	365	}
562	366	$title = apply_filters( 'visualizer_schema_name', $title, $id );
563	367	if ( empty( $title ) ) {
564		- if ( $show_errors ) {
565		- return "<!-- Not showing structured data for chart $id because title is empty -->";
566		- }
567	368	return '';
568	369	}
569	370
570	371	$desc = '';
		@@ -571,53 +372,13 @@
571	372	if ( isset( $settings['description'] ) && ! empty( $settings['description'] ) ) {
572	373	$desc = $settings['description'];
573	374	}
574	375	$desc = apply_filters( 'visualizer_schema_description', $desc, $id );
575		- if ( empty( $desc ) ) {
576		- if ( $show_errors ) {
577		- return "<!-- Not showing structured data for chart $id because description is empty -->";
578		- }
579		- return '';
580		- }
581		-
582	376	// descriptions below 50 chars are not allowed.
583		- if ( strlen( $desc ) < 50 ) {
584		- if ( $show_errors ) {
585		- return "<!-- Not showing structured data for chart $id because description is shorter than 50 characters -->";
586		- }
	377	+ if ( empty( $desc ) || strlen( $desc ) < 50 ) {
587	378	return '';
588	379	}
589	380
590		- $license = '';
591		- if ( isset( $settings['license'] ) && ! empty( $settings['license'] ) ) {
592		- $license = $settings['license'];
593		- if ( is_array( $license ) ) {
594		- $license = $settings['license']['text'];
595		- }
596		- }
597		- $license = apply_filters( 'visualizer_schema_license', $license, $id );
598		- if ( empty( $license ) ) {
599		- if ( $show_errors ) {
600		- return "<!-- Not showing structured data for chart $id because license is empty -->";
601		- }
602		- return '';
603		- }
604		-
605		- $creator = '';
606		- if ( isset( $settings['creator'] ) && ! empty( $settings['creator'] ) ) {
607		- $creator = $settings['creator'];
608		- if ( is_array( $creator ) ) {
609		- $creator = $settings['creator']['text'];
610		- }
611		- }
612		- $creator = apply_filters( 'visualizer_schema_creator', $creator, $id );
613		- if ( empty( $creator ) ) {
614		- if ( $show_errors ) {
615		- return "<!-- Not showing structured data for chart $id because creator is empty -->";
616		- }
617		- return '';
618		- }
619		-
620	381	$schema = apply_filters(
621	382	'visualizer_schema',
622	383	'{
623	384	"@context":"https://schema.org/",
		@@ -622,14 +383,9 @@
622	383	'{
623	384	"@context":"https://schema.org/",
624	385	"@type":"Dataset",
625	386	"name":"' . esc_html( $title ) . '",
626		- "description":"' . esc_html( $desc ) . '",
627		- "license": "' . esc_html( $license ) . '",
628		- "creator": {
629		- "@type": "Person",
630		- "name": "' . esc_html( $creator ) . '"
631		- }
	387	+ "description":"' . esc_html( $desc ) . '"
632	388	}',
633	389	$id
634	390	);
635	391
		@@ -637,110 +393,6 @@
637	393	return '';
638	394	}
639	395
640	396	return '<script type="application/ld+json">' . $schema . '</script>';
641		- }
642		-
643		- /**
644		- * Get chart by ID.
645		- *
646		- * @param string $cache_key Cache key.
647		- * @param int $chart_id Chart ID.
648		- * @return mixed
649		- */
650		- private function getChartData( $cache_key = '', $chart_id = 0 ) {
651		- if ( ! $chart_id ) {
652		- return false;
653		- }
654		- // Create unique cache key of each chart.
655		- $cache_key .= '_' . $chart_id;
656		- // Get chart from cache.
657		- $chart = get_transient( $cache_key );
658		- if ( $chart ) {
659		- return $chart;
660		- }
661		-
662		- // Get chart by ID.
663		- $chart = get_post( $chart_id );
664		- if ( $chart && Visualizer_Plugin::CPT_VISUALIZER === $chart->post_type ) {
665		- $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
666		- $series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
667		- $is_woocommerce_report = get_post_meta( $chart->ID, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
668		-
669		- if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) {
670		- $diff_total_series = abs( count( $settings['series'] ) - count( $series ) );
671		- if ( $diff_total_series ) {
672		- foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
673		- $settings['series'][] = end( $settings['series'] );
674		- }
675		- }
676		- }
677		- $chart_data = array(
678		- 'chart' => $chart,
679		- 'type' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ),
680		- 'settings' => $settings,
681		- 'series' => $series,
682		- 'chart_image' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ),
683		- 'is_woocommerce_report' => $is_woocommerce_report,
684		- );
685		-
686		- // Put the results in a transient. Expire after 12 hours.
687		- set_transient( $cache_key, $chart_data, apply_filters( Visualizer_Plugin::FILTER_HANDLE_CACHE_EXPIRATION_TIME, 12 * HOUR_IN_SECONDS ) );
688		- return $chart_data;
689		- }
690		-
691		- return false;
692		- }
693		-
694		- /**
695		- * Print footer script.
696		- */
697		- public function printFooterScripts() {
698		- if ( $this->lazy_render_script ) {
699		- ?>
700		- <script type="text/javascript">
701		- var visualizerUserInteractionEvents = [
702		- "mouseover",
703		- "keydown",
704		- "touchmove",
705		- "touchstart"
706		- ];
707		-
708		- visualizerUserInteractionEvents.forEach(function(event) {
709		- window.addEventListener(event, visualizerTriggerScriptLoader, { passive: true });
710		- });
711		-
712		- function visualizerTriggerScriptLoader() {
713		- visualizerLoadScripts();
714		- visualizerUserInteractionEvents.forEach(function(event) {
715		- window.removeEventListener(event, visualizerTriggerScriptLoader, { passive: true });
716		- });
717		- }
718		-
719		- function visualizerLoadScripts() {
720		- document.querySelectorAll("script[data-visualizer-script]").forEach(function(elem) {
721		- jQuery.getScript( elem.getAttribute("data-visualizer-script") )
722		- .done( function( script, textStatus ) {
723		- elem.setAttribute("src", elem.getAttribute("data-visualizer-script"));
724		- elem.removeAttribute("data-visualizer-script");
725		- setTimeout( function() {
726		- visualizerRefreshChart();
727		- } );
728		- } );
729		- });
730		- }
731		-
732		- function visualizerRefreshChart() {
733		- jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
734		- if ( jQuery( 'div.viz-facade-loaded:not(.visualizer-lazy):empty' ).length > 0 ) {
735		- visualizerUserInteractionEvents.forEach( function( event ) {
736		- window.addEventListener( event, function() {
737		- jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
738		- }, { passive: true } );
739		- } );
740		- }
741		- }
742		- </script>
743		- <?php
744		- }
745	397	}
746	398	}