← All changes | classes/Visualizer/Module/Chart.php +5 -30 3.0.5 → 2.2.0 View file →

		@@ -227,19 +227,15 @@
227	227	$chart_id, Visualizer_Plugin::CF_SETTINGS, array(
228	228	'focusTarget' => 'datum',
229	229	)
230	230	);
231		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
232	231	}
233	232	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
234	233	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
235	234	}
236	235	// enqueue and register scripts and styles
237		- wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
238		- wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
239		-
240		- wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
241		- wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
	236	+ wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION );
	237	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
242	238	wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
243	239	wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
244	240	wp_register_script(
245	241	'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
		@@ -260,21 +256,17 @@
260	256	$Visualizer_Pro->_addScriptsAndStyles();
261	257	}
262	258	// dispatch pages
263	259	$this->_chart = get_post( $chart_id );
264		- $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
265		- switch ( $tab ) {
	260	+ switch ( isset( $_GET['tab'] ) ? $_GET['tab'] : '' ) {
266	261	case 'settings':
267	262	// changed by Ash/Upwork
268	263	$this->_handleDataAndSettingsPage();
269	264	break;
270		- case 'type': // fall through.
271		- case 'visualizer': // fall through.
	265	+ case 'type':
	266	+ default:
272	267	$this->_handleTypesPage();
273	268	break;
274		- default:
275		- do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
276		- break;
277	269	}
278	270	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
279	271	}
280	272
		@@ -320,23 +312,13 @@
320	312	wp_localize_script(
321	313	'visualizer-render', 'visualizer', array(
322	314	'l10n' => array(
323	315	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
324		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
325	316	),
326	317	'charts' => array(
327	318	'canvas' => $data,
328	319	),
329	320	'map_api_key' => get_option( 'visualizer-map-api-key' ),
330		- 'ajax' => array(
331		- 'url' => admin_url( 'admin-ajax.php' ),
332		- 'nonces' => array(
333		- 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
334		- ),
335		- 'actions' => array(
336		- 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
337		- ),
338		- ),
339	321	)
340	322	);
341	323	$render = new Visualizer_Render_Page_Data();
342	324	$render->chart = $this->_chart;
		@@ -429,14 +411,8 @@
429	411	}
430	412	if ( ! isset( $_POST['vz-import-time'] ) ) {
431	413	apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
432	414	}
433		-
434		- if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
435		- // delete the filters in case this chart is being uploaded from other data sources
436		- delete_post_meta( $chart_id, 'visualizer-filter-config' );
437		- }
438		-
439	415	$source = null;
440	416	$render = new Visualizer_Render_Page_Update();
441	417	if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
442	418	$source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
		@@ -571,9 +547,8 @@
571	547	wp_localize_script(
572	548	'visualizer-render', 'visualizer', array(
573	549	'l10n' => array(
574	550	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
575		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
576	551	),
577	552	'charts' => array(
578	553	'canvas' => $data,
579	554	),