← All changes | classes/Visualizer/Module/Chart.php +6 -42 3.0.7 → 2.2.0 View file →

		@@ -82,13 +82,8 @@
82	82	)
83	83	),
84	84	);
85	85	$filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
86		- if ( empty( $filter ) ) {
87		- // 'filter' is from the modal from the add media button.
88		- $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
89		- }
90		-
91	86	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
92	87	$query_args['meta_query'] = array(
93	88	array(
94	89	'key' => Visualizer_Plugin::CF_CHART_TYPE,
		@@ -232,19 +227,15 @@
232	227	$chart_id, Visualizer_Plugin::CF_SETTINGS, array(
233	228	'focusTarget' => 'datum',
234	229	)
235	230	);
236		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
237	231	}
238	232	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
239	233	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
240	234	}
241	235	// enqueue and register scripts and styles
242		- wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
243		- wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
244		-
245		- wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
246		- 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 );
247	238	wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
248	239	wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
249	240	wp_register_script(
250	241	'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
		@@ -265,26 +256,17 @@
265	256	$Visualizer_Pro->_addScriptsAndStyles();
266	257	}
267	258	// dispatch pages
268	259	$this->_chart = get_post( $chart_id );
269		- $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
270		-
271		- // skip chart type pages only for existing charts.
272		- if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) {
273		- $tab = 'settings';
274		- }
275		-
276		- switch ( $tab ) {
	260	+ switch ( isset( $_GET['tab'] ) ? $_GET['tab'] : '' ) {
277	261	case 'settings':
	262	+ // changed by Ash/Upwork
278	263	$this->_handleDataAndSettingsPage();
279	264	break;
280		- case 'type': // fall through.
281		- case 'visualizer': // fall through.
	265	+ case 'type':
	266	+ default:
282	267	$this->_handleTypesPage();
283	268	break;
284		- default:
285		- do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
286		- break;
287	269	}
288	270	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
289	271	}
290	272
		@@ -330,24 +312,13 @@
330	312	wp_localize_script(
331	313	'visualizer-render', 'visualizer', array(
332	314	'l10n' => array(
333	315	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
334		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
335	316	),
336	317	'charts' => array(
337	318	'canvas' => $data,
338	319	),
339		- 'language' => $this->get_language(),
340	320	'map_api_key' => get_option( 'visualizer-map-api-key' ),
341		- 'ajax' => array(
342		- 'url' => admin_url( 'admin-ajax.php' ),
343		- 'nonces' => array(
344		- 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
345		- ),
346		- 'actions' => array(
347		- 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
348		- ),
349		- ),
350	321	)
351	322	);
352	323	$render = new Visualizer_Render_Page_Data();
353	324	$render->chart = $this->_chart;
		@@ -440,14 +411,8 @@
440	411	}
441	412	if ( ! isset( $_POST['vz-import-time'] ) ) {
442	413	apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
443	414	}
444		-
445		- if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
446		- // delete the filters in case this chart is being uploaded from other data sources
447		- delete_post_meta( $chart_id, 'visualizer-filter-config' );
448		- }
449		-
450	415	$source = null;
451	416	$render = new Visualizer_Render_Page_Update();
452	417	if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
453	418	$source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
		@@ -582,9 +547,8 @@
582	547	wp_localize_script(
583	548	'visualizer-render', 'visualizer', array(
584	549	'l10n' => array(
585	550	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
586		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
587	551	),
588	552	'charts' => array(
589	553	'canvas' => $data,
590	554	),