← All changes | classes/Visualizer/Module/Frontend.php +32 -8 3.0.6 → 3.0.12 View file →

		@@ -53,8 +53,10 @@
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' );
	58	+ $this->_addFilter( 'visualizer_get_language', 'getLanguage' );
57	59	$this->_addShortcode( 'visualizer', 'renderChart' );
58	60
59	61	// add do_shortocde hook for widget_text filter
60	62	if ( ! has_filter( 'widget_text', 'do_shortcode' ) ) {
		@@ -69,8 +71,16 @@
69	71	add_action( 'rest_api_init', array( $this, 'endpoint_register' ) );
70	72	}
71	73
72	74	/**
	75	+ * Returns the language/locale.
	76	+ */
	77	+ function getLanguage( $dummy, $only_language ) {
	78	+ return $this->get_language();
	79	+ }
	80	+
	81	+
	82	+ /**
73	83	* Registers the endpoints
74	84	*/
75	85	function endpoint_register() {
76	86	register_rest_route(
		@@ -89,9 +99,10 @@
89	99	* @access private
90	100	*/
91	101	private function get_actions() {
92	102	return apply_filters(
93		- 'visualizer_action_buttons', array(
	103	+ 'visualizer_action_buttons',
	104	+ array(
94	105	'print' => __( 'Print', 'visualizer' ),
95	106	'csv' => __( 'CSV', 'visualizer' ),
96	107	'xls' => __( 'Excel', 'visualizer' ),
97	108	'copy' => __( 'Copy', 'visualizer' ),
		@@ -147,11 +158,11 @@
147	158	*/
148	159	public function enqueueScripts() {
149	160	wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
150	161	wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
151		- wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
	162	+ wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	163	+ wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery', 'visualizer-customization' ), Visualizer_Plugin::VERSION, true );
152	164	wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
153		- wp_enqueue_script( 'visualizer-clipboardjs' );
154	165	wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
155	166	do_action( 'visualizer_pro_frontend_load_resources' );
156	167	}
157	168
		@@ -176,9 +187,10 @@
176	187	'class' => false, // chart class
177	188	'series' => false, // series filter hook
178	189	'data' => false, // data filter hook
179	190	'settings' => false, // data filter hook
180		- ), $atts
	191	+ ),
	192	+ $atts
181	193	);
182	194
183	195	// if empty id or chart does not exists, then return empty string
184	196	if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
		@@ -188,8 +200,13 @@
188	200	if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
189	201	return '';
190	202	}
191	203
	204	+ // in case revisions exist.
	205	+ if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
	206	+ $chart = get_post( $chart->ID );
	207	+ }
	208	+
192	209	$id = 'visualizer-' . $atts['id'];
193	210	$defaultClass = 'visualizer-front';
194	211	$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
195	212	$class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id'];
		@@ -214,9 +231,9 @@
214	231	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
215	232	}
216	233
217	234	// handle data filter hooks
218		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	235	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
219	236	if ( ! empty( $atts['data'] ) ) {
220	237	$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
221	238	}
222	239
		@@ -221,11 +238,14 @@
221	238	}
222	239
223	240	$id = $id . '-' . rand();
224	241	$arguments = array( '', $id, $settings );
	242	+ $css = '';
225	243	apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) );
226		- $css = $arguments[0];
227		- $settings = $arguments[2];
	244	+ if ( ! empty( $arguments ) ) {
	245	+ $css = $arguments[0];
	246	+ $settings = $arguments[2];
	247	+ }
228	248
229	249	// add chart to the array
230	250	$this->_charts[ $id ] = array(
231	251	'type' => $type,
		@@ -236,10 +256,13 @@
236	256
237	257	// enqueue visualizer render and update render localizations
238	258	wp_enqueue_script( 'visualizer-render' );
239	259	wp_localize_script(
240		- 'visualizer-render', 'visualizer', array(
	260	+ 'visualizer-render',
	261	+ 'visualizer',
	262	+ array(
241	263	'charts' => $this->_charts,
	264	+ 'language' => $this->get_language(),
242	265	'map_api_key' => get_option( 'visualizer-map-api-key' ),
243	266	'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
244	267	'i10n' => array(
245	268	'copied' => __( 'Copied!', 'visualizer' ),
		@@ -266,8 +289,9 @@
266	289
267	290	if ( 'copy' === $key ) {
268	291	$copy = $this->_getDataAs( $atts['id'], 'csv' );
269	292	$actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"';
	293	+ wp_enqueue_script( 'visualizer-clipboardjs' );
270	294	}
271	295
272	296	$actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] );
273	297	$actions_div .= '>' . $label . '</a> &nbsp;';