← All changes | classes/Visualizer/Module/Chart.php +40 -12 3.0.11 → 3.0.12 View file →

		@@ -71,9 +71,12 @@
71	71	$query_args = array(
72	72	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
73	73	'posts_per_page' => 9,
74	74	'paged' => filter_input(
75		- INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
	75	+ INPUT_GET,
	76	+ 'page',
	77	+ FILTER_VALIDATE_INT,
	78	+ array(
76	79	'options' => array(
77	80	'min_range' => 1,
78	81	'default' => 1,
79	82	),
		@@ -170,9 +173,12 @@
170	173	$nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
171	174	$capable = current_user_can( 'delete_posts' );
172	175	if ( $nonce && $capable ) {
173	176	$chart_id = filter_input(
174		- $input_method, 'chart', FILTER_VALIDATE_INT, array(
	177	+ $input_method,
	178	+ 'chart',
	179	+ FILTER_VALIDATE_INT,
	180	+ array(
175	181	'options' => array(
176	182	'min_range' => 1,
177	183	),
178	184	)
		@@ -226,9 +232,11 @@
226	232	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
227	233	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
228	234	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
229	235	add_post_meta(
230		- $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
	236	+ $chart_id,
	237	+ Visualizer_Plugin::CF_SETTINGS,
	238	+ array(
231	239	'focusTarget' => 'datum',
232	240	)
233	241	);
234	242	do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
		@@ -243,20 +251,30 @@
243	251	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
244	252	wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
245	253	wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
246	254	wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	255	+ wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
247	256	wp_register_script(
248		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
	257	+ 'visualizer-render',
	258	+ VISUALIZER_ABSURL . 'js/render.js',
	259	+ array(
249	260	'google-jsapi-old',
250	261	'google-jsapi-new',
251	262	'visualizer-frame',
252		- ), Visualizer_Plugin::VERSION, true
	263	+ 'visualizer-customization',
	264	+ ),
	265	+ Visualizer_Plugin::VERSION,
	266	+ true
253	267	);
254	268	wp_register_script(
255		- 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
	269	+ 'visualizer-preview',
	270	+ VISUALIZER_ABSURL . 'js/preview.js',
	271	+ array(
256	272	'wp-color-picker',
257	273	'visualizer-render',
258		- ), Visualizer_Plugin::VERSION, true
	274	+ ),
	275	+ Visualizer_Plugin::VERSION,
	276	+ true
259	277	);
260	278	// added by Ash/Upwork
261	279	if ( VISUALIZER_PRO ) {
262	280	global $Visualizer_Pro;
		@@ -343,9 +361,11 @@
343	361	wp_enqueue_style( 'visualizer-frame' );
344	362	wp_enqueue_script( 'visualizer-preview' );
345	363	wp_enqueue_script( 'visualizer-render' );
346	364	wp_localize_script(
347		- 'visualizer-render', 'visualizer', array(
	365	+ 'visualizer-render',
	366	+ 'visualizer',
	367	+ array(
348	368	'l10n' => array(
349	369	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
350	370	'loading' => esc_html__( 'Loading...', 'visualizer' ),
351	371	),
		@@ -537,9 +557,12 @@
537	557	$nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
538	558	$capable = current_user_can( 'edit_posts' );
539	559	if ( $nonce && $capable ) {
540	560	$chart_id = filter_input(
541		- INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
	561	+ INPUT_GET,
	562	+ 'chart',
	563	+ FILTER_VALIDATE_INT,
	564	+ array(
542	565	'options' => array(
543	566	'min_range' => 1,
544	567	),
545	568	)
		@@ -569,9 +592,10 @@
569	592	$redirect = add_query_arg(
570	593	array(
571	594	'page' => 'visualizer',
572	595	'type' => filter_input( INPUT_GET, 'type' ),
573		- ), admin_url( 'upload.php' )
	596	+ ),
	597	+ admin_url( 'upload.php' )
574	598	);
575	599	}
576	600	}
577	601	wp_redirect( $redirect );
		@@ -589,9 +613,11 @@
589	613	check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
590	614	$capable = current_user_can( 'edit_posts' );
591	615	if ( $capable ) {
592	616	$chart_id = isset( $_GET['chart'] ) ? filter_var(
593		- $_GET['chart'], FILTER_VALIDATE_INT, array(
	617	+ $_GET['chart'],
	618	+ FILTER_VALIDATE_INT,
	619	+ array(
594	620	'options' => array(
595	621	'min_range' => 1,
596	622	),
597	623	)
		@@ -622,9 +648,11 @@
622	648	unset( $data['settings']['width'], $data['settings']['height'] );
623	649	wp_enqueue_style( 'visualizer-frame' );
624	650	wp_enqueue_script( 'visualizer-render' );
625	651	wp_localize_script(
626		- 'visualizer-render', 'visualizer', array(
	652	+ 'visualizer-render',
	653	+ 'visualizer',
	654	+ array(
627	655	'l10n' => array(
628	656	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
629	657	'loading' => esc_html__( 'Loading...', 'visualizer' ),
630	658	),