← All changes | classes/Visualizer/Module/Frontend.php +38 -16 3.0.7 → 3.1.1 View file →

		@@ -53,8 +53,9 @@
53	53	public function __construct( Visualizer_Plugin $plugin ) {
54	54	parent::__construct( $plugin );
55	55
56	56	$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
	57	+ $this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' );
57	58	$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
58	59	$this->_addShortcode( 'visualizer', 'renderChart' );
59	60
60	61	// add do_shortocde hook for widget_text filter
		@@ -98,9 +99,10 @@
98	99	* @access private
99	100	*/
100	101	private function get_actions() {
101	102	return apply_filters(
102		- 'visualizer_action_buttons', array(
	103	+ 'visualizer_action_buttons',
	104	+ array(
103	105	'print' => __( 'Print', 'visualizer' ),
104	106	'csv' => __( 'CSV', 'visualizer' ),
105	107	'xls' => __( 'Excel', 'visualizer' ),
106	108	'copy' => __( 'Copy', 'visualizer' ),
		@@ -154,11 +156,9 @@
154	156	*
155	157	* @access public
156	158	*/
157	159	public function enqueueScripts() {
158		- wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
159		- wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
160		- wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
	160	+ wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
161	161	wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
162	162	wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
163	163	do_action( 'visualizer_pro_frontend_load_resources' );
164	164	}
		@@ -184,9 +184,10 @@
184	184	'class' => false, // chart class
185	185	'series' => false, // series filter hook
186	186	'data' => false, // data filter hook
187	187	'settings' => false, // data filter hook
188		- ), $atts
	188	+ ),
	189	+ $atts
189	190	);
190	191
191	192	// if empty id or chart does not exists, then return empty string
192	193	if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
		@@ -196,8 +197,13 @@
196	197	if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
197	198	return '';
198	199	}
199	200
	201	+ // in case revisions exist.
	202	+ if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
	203	+ $chart = get_post( $chart->ID );
	204	+ }
	205	+
200	206	$id = 'visualizer-' . $atts['id'];
201	207	$defaultClass = 'visualizer-front';
202	208	$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
203	209	$class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id'];
		@@ -204,9 +210,11 @@
204	210	$class = ! empty( $class ) ? ' class="' . trim( $class ) . '"' : '';
205	211
206	212	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
207	213
208		- // faetch and update settings
	214	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
	215	+
	216	+ // fetch and update settings
209	217	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
210	218	if ( empty( $settings['height'] ) ) {
211	219	$settings['height'] = '400';
212	220	}
		@@ -222,19 +230,22 @@
222	230	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
223	231	}
224	232
225	233	// handle data filter hooks
226		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	234	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
227	235	if ( ! empty( $atts['data'] ) ) {
228	236	$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
229	237	}
230	238
231		- $id = $id . '-' . rand();
232		- $arguments = array( '', $id, $settings );
233		- apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) );
234		- $css = $arguments[0];
235		- $settings = $arguments[2];
	239	+ $css = '';
	240	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	241	+ if ( ! empty( $arguments ) ) {
	242	+ $css = $arguments[0];
	243	+ $settings = $arguments[1];
	244	+ }
236	245
	246	+ $library = $this->load_chart_type( $chart->ID );
	247	+
237	248	// add chart to the array
238	249	$this->_charts[ $id ] = array(
239	250	'type' => $type,
240	251	'series' => $series,
		@@ -239,21 +250,32 @@
239	250	'type' => $type,
240	251	'series' => $series,
241	252	'settings' => $settings,
242	253	'data' => $data,
	254	+ 'library' => $library,
243	255	);
244	256
245		- // enqueue visualizer render and update render localizations
246		- wp_enqueue_script( 'visualizer-render' );
	257	+ wp_register_script(
	258	+ "visualizer-render-$library",
	259	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	260	+ apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
	261	+ Visualizer_Plugin::VERSION,
	262	+ true
	263	+ );
	264	+
	265	+ wp_enqueue_script( "visualizer-render-$library" );
247	266	wp_localize_script(
248		- 'visualizer-render', 'visualizer', array(
	267	+ "visualizer-render-$library",
	268	+ 'visualizer',
	269	+ array(
249	270	'charts' => $this->_charts,
250		- 'language' => $this->get_language(),
	271	+ 'language' => $this->get_language(),
251	272	'map_api_key' => get_option( 'visualizer-map-api-key' ),
252	273	'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
253	274	'i10n' => array(
254	275	'copied' => __( 'Copied!', 'visualizer' ),
255	276	),
	277	+ 'page_type' => 'frontend',
256	278	)
257	279	);
258	280	wp_enqueue_style( 'visualizer-front' );
259	281