← All changes | classes/Visualizer/Module/Frontend.php +11 -147 3.0.7 → 1.7.1 View file →

		@@ -53,9 +53,8 @@
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->_addFilter( 'visualizer_get_language', 'getLanguage' );
58	57	$this->_addShortcode( 'visualizer', 'renderChart' );
59	58
60	59	// add do_shortocde hook for widget_text filter
61	60	if ( ! has_filter( 'widget_text', 'do_shortcode' ) ) {
		@@ -65,89 +64,11 @@
65	64	// add do_shortcode hook for term_description filter
66	65	if ( ! has_filter( 'term_description', 'do_shortcode' ) ) {
67	66	add_filter( 'term_description', 'do_shortcode' );
68	67	}
69		-
70		- add_action( 'rest_api_init', array( $this, 'endpoint_register' ) );
71	68	}
72	69
73	70	/**
74		- * Returns the language/locale.
75		- */
76		- function getLanguage( $dummy, $only_language ) {
77		- return $this->get_language();
78		- }
79		-
80		-
81		- /**
82		- * Registers the endpoints
83		- */
84		- function endpoint_register() {
85		- register_rest_route(
86		- 'visualizer/v' . VISUALIZER_REST_VERSION,
87		- '/action/(?P<chart>\d+)/(?P<type>.+)/',
88		- array(
89		- 'methods' => array( 'GET', 'POST' ),
90		- 'callback' => array( $this, 'perform_action' ),
91		- )
92		- );
93		- }
94		-
95		- /**
96		- * All possible actions and their labels
97		- *
98		- * @access private
99		- */
100		- private function get_actions() {
101		- return apply_filters(
102		- 'visualizer_action_buttons', array(
103		- 'print' => __( 'Print', 'visualizer' ),
104		- 'csv' => __( 'CSV', 'visualizer' ),
105		- 'xls' => __( 'Excel', 'visualizer' ),
106		- 'copy' => __( 'Copy', 'visualizer' ),
107		- )
108		- );
109		- }
110		-
111		- /**
112		- * The print button
113		- *
114		- * @since 1.0.0
115		- *
116		- * @access public
117		- */
118		- public function perform_action( WP_REST_Request $params ) {
119		- $chart_id = filter_var( sanitize_text_field( $params['chart'] ), FILTER_VALIDATE_INT );
120		- $type = sanitize_text_field( $params['type'] );
121		- $data = null;
122		-
123		- if ( ! $chart_id ) {
124		- return new WP_REST_Response( array( 'error' => new WP_Error( __( 'Invalid chart ID', 'visualizer' ) ) ) );
125		- }
126		-
127		- if ( ! $type ) {
128		- return new WP_REST_Response( array( 'error' => new WP_Error( __( 'Invalid action', 'visualizer' ) ) ) );
129		- }
130		-
131		- switch ( $type ) {
132		- case 'print':
133		- $data = $this->_getDataAs( $chart_id, 'print' );
134		- break;
135		- case 'csv':
136		- $data = $this->_getDataAs( $chart_id, 'csv' );
137		- break;
138		- case 'xls':
139		- $data = $this->_getDataAs( $chart_id, 'xls' );
140		- break;
141		- default:
142		- $data = apply_filters( 'visualizer_action_data', $data, $chart_id, $type, $params, $this );
143		- break;
144		- }
145		-
146		- return new WP_REST_Response( array( 'data' => $data ) );
147		- }
148		-
149		- /**
150	71	* Registers scripts for charts rendering.
151	72	*
152	73	* @since 1.0.0
153	74	* @uses wp_register_script To register javascript file.
		@@ -157,11 +78,8 @@
157	78	public function enqueueScripts() {
158	79	wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
159	80	wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
160	81	wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
161		- wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
162		- wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
163		- do_action( 'visualizer_pro_frontend_load_resources' );
164	82	}
165	83
166	84	/**
167	85	* Returns placeholder for chart according to visualizer shortcode attributes.
		@@ -176,18 +94,15 @@
176	94	* @access public
177	95	* @param array $atts The array of shortcode attributes.
178	96	*/
179	97	public function renderChart( $atts ) {
180		- global $wp_version;
181		- $atts = shortcode_atts(
182		- array(
183		- 'id' => false, // chart id
184		- 'class' => false, // chart class
185		- 'series' => false, // series filter hook
186		- 'data' => false, // data filter hook
187		- 'settings' => false, // data filter hook
188		- ), $atts
189		- );
	98	+ $atts = shortcode_atts( array(
	99	+ 'id' => false, // chart id
	100	+ 'class' => false, // chart class
	101	+ 'series' => false, // series filter hook
	102	+ 'data' => false, // data filter hook
	103	+ 'settings' => false, // data filter hook
	104	+ ), $atts );
190	105
191	106	// if empty id or chart does not exists, then return empty string
192	107	if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
193	108	return '';
		@@ -192,16 +107,12 @@
192	107	if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
193	108	return '';
194	109	}
195	110
196		- if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) {
197		- return '';
198		- }
199		-
200	111	$id = 'visualizer-' . $atts['id'];
201	112	$defaultClass = 'visualizer-front';
202	113	$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );
203		- $class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id'];
	114	+ $class = $defaultClass . ' ' . $class;
204	115	$class = ! empty( $class ) ? ' class="' . trim( $class ) . '"' : '';
205	116
206	117	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
207	118
		@@ -227,14 +138,8 @@
227	138	if ( ! empty( $atts['data'] ) ) {
228	139	$data = apply_filters( $atts['data'], $data, $chart->ID, $type );
229	140	}
230	141
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];
236		-
237	142	// add chart to the array
238	143	$this->_charts[ $id ] = array(
239	144	'type' => $type,
240	145	'series' => $series,
		@@ -243,52 +148,11 @@
243	148	);
244	149
245	150	// enqueue visualizer render and update render localizations
246	151	wp_enqueue_script( 'visualizer-render' );
247		- wp_localize_script(
248		- 'visualizer-render', 'visualizer', array(
249		- 'charts' => $this->_charts,
250		- 'language' => $this->get_language(),
251		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
252		- 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
253		- 'i10n' => array(
254		- 'copied' => __( 'Copied!', 'visualizer' ),
255		- ),
256		- )
257		- );
258		- wp_enqueue_style( 'visualizer-front' );
	152	+ wp_localize_script( 'visualizer-render', 'visualizer', array( 'charts' => $this->_charts ) );
259	153
260		- $actions_div = '';
261		- $actions_visible = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
262		- if ( ! empty( $actions_visible ) ) {
263		- $actions = $this->get_actions();
264		- $actions_div = '<div class="visualizer-actions">';
265		- foreach ( $actions_visible as $action_type ) {
266		- $key = $action_type;
267		- $mime = '';
268		- if ( strpos( $action_type, ';' ) !== false ) {
269		- $array = explode( ';', $action_type );
270		- $key = $array[0];
271		- $mime = end( $array );
272		- }
273		- $label = $actions[ $key ];
274		- $actions_div .= '<a href="#" class="visualizer-action visualizer-action-' . $key . '" data-visualizer-type="' . $key . '" data-visualizer-chart-id="' . $atts['id'] . '" data-visualizer-mime="' . $mime . '" title="' . $label . '" ';
275		-
276		- if ( 'copy' === $key ) {
277		- $copy = $this->_getDataAs( $atts['id'], 'csv' );
278		- $actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"';
279		- wp_enqueue_script( 'visualizer-clipboardjs' );
280		- }
281		-
282		- $actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] );
283		- $actions_div .= '>' . $label . '</a> &nbsp;';
284		- }
285		-
286		- $actions_div .= '</div>';
287		- }
288		-
289		- $actions_div .= $css;
290		-
291	154	// return placeholder div
292		- return $actions_div . '<div id="' . $id . '"' . $class . '></div>';
	155	+ return '<div id="' . $id . '"' . $class . '></div>';
293	156	}
	157	+
294	158	}