← All changes | classes/Visualizer/Module/Frontend.php +45 -183 4.0.3 → 3.7.2 View file →

		@@ -46,9 +46,9 @@
46	46	*
47	47	* @access private
48	48	* @var bool
49	49	*/
50		- private $lazy_render_script = true;
	50	+ private $lazy_render_script = false;
51	51
52	52	/**
53	53	* Constructor.
54	54	*
		@@ -63,9 +63,8 @@
63	63
64	64	$this->_addAction( 'wp_print_footer_scripts', 'printFooterScripts' );
65	65	$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
66	66	$this->_addAction( 'load-index.php', 'enqueueScripts' );
67		- $this->_addAction( 'load-visualizer_page_visualizer-setup-wizard', 'enqueueScripts' );
68	67	$this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' );
69	68	$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
70	69	$this->_addShortcode( 'visualizer', 'renderChart' );
71	70
		@@ -86,9 +85,9 @@
86	85
87	86	/**
88	87	* Adds the async attribute to certain scripts.
89	88	*/
90		- public function script_loader_tag( $tag, $handle, $src ) {
	89	+ function script_loader_tag( $tag, $handle, $src ) {
91	90	if ( is_admin() ) {
92	91	return $tag;
93	92	}
94	93	// Async scripts.
		@@ -97,9 +96,9 @@
97	96	if ( $async === $handle ) {
98	97	$tag = str_replace( ' src', ' async src', $tag );
99	98	break;
100	99	}
101		- }
	100	+ };
102	101
103	102	// Async scripts.
104	103	$scripts = array( 'dom-to-image' );
105	104	foreach ( array( 'async', 'defer' ) as $attr ) {
		@@ -123,9 +122,9 @@
123	122
124	123	/**
125	124	* Returns the language/locale.
126	125	*/
127		- public function getLanguage( $dummy, $only_language ) {
	126	+ function getLanguage( $dummy, $only_language ) {
128	127	return $this->get_language();
129	128	}
130	129
131	130
		@@ -131,9 +130,9 @@
131	130
132	131	/**
133	132	* Registers the endpoints
134	133	*/
135		- public function endpoint_register() {
	134	+ function endpoint_register() {
136	135	register_rest_route(
137	136	'visualizer/v' . VISUALIZER_REST_VERSION,
138	137	'/action/(?P<chart>\d+)/(?P<type>.+)/',
139	138	array(
		@@ -141,9 +140,9 @@
141	140	'methods' => array( 'POST', 'GET' ),
142	141	'args' => array(
143	142	'chart' => array(
144	143	'required' => true,
145		- 'sanitize_callback' => function ( $param ) {
	144	+ 'sanitize_callback' => function( $param ) {
146	145	return is_numeric( $param ) ? $param : null;
147	146	},
148	147	),
149	148	'type' => array(
		@@ -305,25 +304,8 @@
305	304	),
306	305	$atts
307	306	);
308	307
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	308	$chart_data = $this->getChartData( Visualizer_Plugin::CF_CHART_CACHE, $atts['id'] );
327	309	// if empty chart does not exists, then return empty string.
328	310	if ( ! $chart_data ) {
329	311	return '';
		@@ -336,21 +318,14 @@
336	318	if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
337	319	return '';
338	320	}
339	321
340		- if ( ! is_admin() && ! empty( $chart_data['is_woocommerce_report'] ) ) {
341		- return '';
	322	+ // in case revisions exist.
	323	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
	324	+ if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
	325	+ $chart = get_post( $chart->ID );
342	326	}
343	327
344		- // in case revisions exist (skip D3 charts to avoid reverting AI data).
345		- $chart_library = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, true );
346		- if ( 'd3' !== $chart_library ) {
347		- $revisions = $this->undoRevisions( $chart->ID, true );
348		- if ( true === $revisions ) {
349		- $chart = get_post( $chart->ID );
350		- }
351		- }
352		-
353	328	$id = 'visualizer-' . $atts['id'];
354	329	$defaultClass = 'visualizer-front';
355	330	$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
356	331
		@@ -365,15 +340,12 @@
365	340	if ( ctype_digit( $atts['lazy'] ) ) {
366	341	$attributes['data-lazy-limit'] = $atts['lazy'];
367	342	}
368	343
369		- $attributes = apply_filters( 'visualizer_container_attributes', $attributes, $chart->ID );
370		-
371	344	$chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
372	345
373	346	// Get and update settings.
374	347	$settings = $chart_data['settings'];
375		- $settings = ! empty( $settings ) ? $settings : array();
376	348	if ( empty( $settings['height'] ) ) {
377	349	$settings['height'] = '400';
378	350	}
379	351
		@@ -385,11 +357,10 @@
385	357
386	358	$lazy_load = isset( $settings['lazy_load_chart'] ) ? $settings['lazy_load_chart'] : false;
387	359	$lazy_load = apply_filters( 'visualizer_lazy_load_chart', $lazy_load, $chart->ID );
388	360	$container_class = 'visualizer-front-container';
389		- if ( ! $lazy_load ) {
390		- $this->lazy_render_script = false;
391		- } else {
	361	+ if ( $lazy_load ) {
	362	+ $this->lazy_render_script = true;
392	363	$container_class .= ' visualizer-lazy-render';
393	364	}
394	365
395	366	// handle data filter hooks
		@@ -421,23 +392,10 @@
421	392	if ( isset( $settings['chart-img'] ) ) {
422	393	unset( $settings['chart-img'] );
423	394	}
424	395
425		- $enable_controls = false;
426		- if ( isset( $settings['controls'] ) && ! empty( $settings['controls']['controlType'] ) ) {
427		- $column_index = $settings['controls']['filterColumnIndex'];
428		- $column_label = $settings['controls']['filterColumnLabel'];
429		- if ( 'false' !== $column_index || 'false' !== $column_label ) {
430		- $enable_controls = true;
431		- }
432		- }
433		-
434		- if ( ! $enable_controls ) {
435		- unset( $settings['controls'] );
436		- }
437		-
438	396	// add chart to the array
439		- $chart_entry = array(
	397	+ $this->_charts[ $id ] = array(
440	398	'type' => $type,
441	399	'series' => $series,
442	400	'settings' => $settings,
443	401	'data' => $data,
		@@ -443,15 +401,8 @@
443	401	'data' => $data,
444	402	'library' => $library,
445	403	);
446	404
447		- // For D3 charts, include the stored code so the renderer can execute it.
448		- if ( 'd3' === $library ) {
449		- $chart_entry['code'] = get_post_meta( $chart->ID, Visualizer_Module_AIBuilder::CF_D3_CODE, true );
450		- }
451		-
452		- $this->_charts[ $id ] = $chart_entry;
453		-
454	405	$actions_div = '';
455	406	$actions_visible = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
456	407	if ( ! empty( $actions_visible ) ) {
457	408	$actions = $this->get_actions();
		@@ -484,115 +435,44 @@
484	435	$actions_div .= $css;
485	436
486	437	$_charts = array();
487	438	$_charts_type = '';
488		- $count = 0;
489		- static $visualizer_localized = false;
490		- static $visualizer_charts = array();
491		- static $d3_localized = false;
492		- $facade_handle = 'visualizer-render-facade';
493	439	foreach ( $this->_charts as $id => $array ) {
494	440	$_charts = $this->_charts;
495	441	$library = $array['library'];
496	442	$_charts_type = $library;
497		- $facade_deps = apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true );
498		- if ( ! wp_script_is( $facade_handle, 'registered' ) ) {
	443	+ if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) {
499	444	wp_register_script(
500		- $facade_handle,
	445	+ "visualizer-render-$library",
501	446	VISUALIZER_ABSURL . 'js/render-facade.js',
502		- $facade_deps,
	447	+ apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
503	448	Visualizer_Plugin::VERSION,
504	449	true
505	450	);
506		- wp_enqueue_script( $facade_handle );
507		- } else {
508		- // Ensure newly discovered dependencies are attached to the facade.
509		- global $wp_scripts;
510		- if ( isset( $wp_scripts->registered[ $facade_handle ] ) ) {
511		- $wp_scripts->registered[ $facade_handle ]->deps = array_unique(
512		- array_merge( $wp_scripts->registered[ $facade_handle ]->deps, $facade_deps )
513		- );
514		- }
515		- foreach ( $facade_deps as $dep_handle ) {
516		- wp_enqueue_script( $dep_handle );
517		- }
	451	+ wp_enqueue_script( "visualizer-render-$library" );
518	452	}
519		-
520		- // For D3 charts, also enqueue the dedicated renderer bundle.
521		- if ( 'd3' === $library ) {
522		- $d3_renderer_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/D3Renderer/build/index.asset.php';
523		- if ( file_exists( $d3_renderer_asset ) && ! wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) {
524		- /**
525		- * Ignore missing build asset in source checkout.
526		- *
527		- * @phpstan-ignore-next-line
528		- */
529		- $d3_asset = include $d3_renderer_asset;
530		- wp_register_script(
531		- 'visualizer-d3-renderer',
532		- VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/index.js',
533		- array_merge( $d3_asset['dependencies'], array( 'jquery' ) ),
534		- $d3_asset['version'],
535		- true
536		- );
537		- wp_enqueue_script( 'visualizer-d3-renderer' );
538		- }
539		- if ( ! $d3_localized ) {
540		- wp_localize_script(
541		- 'visualizer-d3-renderer',
542		- 'vizD3Renderer',
543		- array(
544		- 'iframeJsUrl' => VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/iframe.js',
545		- )
546		- );
547		- $d3_localized = true;
548		- }
549		- }
550		-
551		- if ( wp_script_is( $facade_handle ) && 0 === $count ) {
552		- if ( ! $visualizer_localized ) {
553		- $visualizer_charts = $this->_charts;
554		- wp_localize_script(
555		- $facade_handle,
556		- 'visualizer',
557		- array(
558		- 'charts' => $this->_charts,
559		- 'language' => $this->get_language(),
560		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
561		- 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
562		- 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
563		- 'i10n' => array(
564		- 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
565		- ),
566		- 'page_type' => 'frontend',
567		- 'is_front' => true,
568		- )
569		- );
570		- $visualizer_localized = true;
571		- } else {
572		- $new_charts = array_diff_key( $this->_charts, $visualizer_charts );
573		- if ( ! empty( $new_charts ) ) {
574		- wp_add_inline_script(
575		- $facade_handle,
576		- 'window.visualizer = window.visualizer || {};' .
577		- 'window.visualizer.charts = Object.assign(window.visualizer.charts || {}, ' . wp_json_encode( $new_charts ) . ');',
578		- 'before'
579		- );
580		- $visualizer_charts = array_merge( $visualizer_charts, $new_charts );
581		- }
582		- }
583		- }
584		- ++$count;
585	453	}
586		- $prefix = 'C' . 'h' . 'a' . 'rt';
587		- if ( $type === 'tabular' ) {
588		- $prefix = 'T' . 'a' . 'bl' . 'e';
	454	+ if ( wp_script_is( "visualizer-render-$_charts_type" ) ) {
	455	+ wp_localize_script(
	456	+ "visualizer-render-$_charts_type",
	457	+ 'visualizer',
	458	+ array(
	459	+ 'charts' => $_charts,
	460	+ 'language' => $this->get_language(),
	461	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
	462	+ 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
	463	+ 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
	464	+ 'i10n' => array(
	465	+ 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
	466	+ ),
	467	+ 'page_type' => 'frontend',
	468	+ 'is_front' => true,
	469	+ )
	470	+ );
589	471	}
590		- if ( Visualizer_Module::is_pro() && $enable_controls ) {
591		- $actions_div .= '<div id="control_wrapper_' . $id . '"></div>';
592		- }
	472	+
593	473	// return placeholder div
594		- return '<div class="' . $container_class . '" id="chart_wrapper_' . $id . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . '</div>';
	474	+ return '<div class="' . $container_class . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . '</div>';
595	475	}
596	476
597	477	/**
598	478	* Converts the array of attributes to a string of HTML attributes.
		@@ -607,9 +487,9 @@
607	487	return $string;
608	488	}
609	489
610	490	foreach ( $attributes as $name => $value ) {
611		- $string .= sprintf( ' %s="%s"', esc_attr( $name ), esc_attr( $value ) );
	491	+ $string .= sprintf( '%s="%s"', esc_attr( $name ), esc_attr( $value ) );
612	492	}
613	493	return $string;
614	494	}
615	495
		@@ -734,11 +614,10 @@
734	614
735	615	// Get chart by ID.
736	616	$chart = get_post( $chart_id );
737	617	if ( $chart && Visualizer_Plugin::CPT_VISUALIZER === $chart->post_type ) {
738		- $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
739		- $series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
740		- $is_woocommerce_report = get_post_meta( $chart->ID, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
	618	+ $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
	619	+ $series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
741	620
742	621	if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) {
743	622	$diff_total_series = abs( count( $settings['series'] ) - count( $series ) );
744	623	if ( $diff_total_series ) {
		@@ -747,14 +626,13 @@
747	626	}
748	627	}
749	628	}
750	629	$chart_data = array(
751		- 'chart' => $chart,
752		- 'type' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ),
753		- 'settings' => $settings,
754		- 'series' => $series,
755		- 'chart_image' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ),
756		- 'is_woocommerce_report' => $is_woocommerce_report,
	630	+ 'chart' => $chart,
	631	+ 'type' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ),
	632	+ 'settings' => $settings,
	633	+ 'series' => $series,
	634	+ 'chart_image' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ),
757	635	);
758	636
759	637	// Put the results in a transient. Expire after 12 hours.
760	638	set_transient( $cache_key, $chart_data, apply_filters( Visualizer_Plugin::FILTER_HANDLE_CACHE_EXPIRATION_TIME, 12 * HOUR_IN_SECONDS ) );
		@@ -771,9 +649,8 @@
771	649	if ( $this->lazy_render_script ) {
772	650	?>
773	651	<script type="text/javascript">
774	652	var visualizerUserInteractionEvents = [
775		- "scroll",
776	653	"mouseover",
777	654	"keydown",
778	655	"touchmove",
779	656	"touchstart"
		@@ -791,28 +668,13 @@
791	668	}
792	669
793	670	function visualizerLoadScripts() {
794	671	document.querySelectorAll("script[data-visualizer-script]").forEach(function(elem) {
795		- jQuery.getScript( elem.getAttribute("data-visualizer-script") )
796		- .done( function( script, textStatus ) {
	672	+ jQuery.getScript( elem.getAttribute("data-visualizer-script"), function() {
797	673	elem.setAttribute("src", elem.getAttribute("data-visualizer-script"));
798	674	elem.removeAttribute("data-visualizer-script");
799		- setTimeout( function() {
800		- visualizerRefreshChart();
801		- } );
802	675	} );
803	676	});
804		- }
805		-
806		- function visualizerRefreshChart() {
807		- jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
808		- if ( jQuery( 'div.viz-facade-loaded:not(.visualizer-lazy):empty' ).length > 0 ) {
809		- visualizerUserInteractionEvents.forEach( function( event ) {
810		- window.addEventListener( event, function() {
811		- jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
812		- }, { passive: true } );
813		- } );
814		- }
815	677	}
816	678	</script>
817	679	<?php
818	680	}