← All changes | classes/Visualizer/Module/Admin.php +16 -32 3.1.2 → 3.1.0 View file →

		@@ -214,12 +214,10 @@
214	214	if ( post_type_supports( $typenow, 'editor' ) ) {
215	215	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216	216
217	217	// Load all the assets for the different libraries we support.
218		- $deps = array(
219		- Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
220		- Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) ),
221		- );
	218	+ $deps = Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) );
	219	+ $deps += Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) );
222	220
223	221	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
224	222	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
225	223	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
		@@ -322,16 +320,16 @@
322	320	'column' => array(
323	321	'name' => esc_html__( 'Column', 'visualizer' ),
324	322	'enabled' => true,
325	323	),
	324	+ 'gauge' => array(
	325	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	326	+ 'enabled' => true,
	327	+ ),
326	328	'scatter' => array(
327	329	'name' => esc_html__( 'Scatter', 'visualizer' ),
328	330	'enabled' => true,
329	331	),
330		- 'gauge' => array(
331		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
332		- 'enabled' => true,
333		- ),
334	332	'candlestick' => array(
335	333	'name' => esc_html__( 'Candlestick', 'visualizer' ),
336	334	'enabled' => true,
337	335	),
		@@ -400,20 +398,12 @@
400	398
401	399	// if a user has a Gauge/Candlestick chart, then let them keep using it.
402	400	if ( ! VISUALIZER_PRO ) {
403	401	if ( ! self::hasChartType( 'gauge' ) ) {
404		- if ( $get2Darray ) {
405		- $deprecated[] = 'gauge';
406		- } else {
407		- $types['gauge']['enabled'] = false;
408		- }
	402	+ $deprecated[] = 'gauge';
409	403	}
410	404	if ( ! self::hasChartType( 'candlestick' ) ) {
411		- if ( $get2Darray ) {
412		- $deprecated[] = 'candlestick';
413		- } else {
414		- $types['candlestick']['enabled'] = false;
415		- }
	405	+ $deprecated[] = 'candlestick';
416	406	}
417	407	}
418	408	break;
419	409	default:
		@@ -420,29 +410,23 @@
420	410	// remove the option to create a Google Table chart.
421	411	$deprecated[] = 'table';
422	412
423	413	// rename the new table chart type.
424		- if ( $get2Darray ) {
425		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
426		- } else {
427		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	414	+ if ( self::hasChartType( 'table' ) ) {
	415	+ if ( $get2Darray ) {
	416	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	417	+ } else {
	418	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	419	+ }
428	420	}
429	421
430	422	// if a user has a Gauge/Candlestick chart, then let them keep using it.
431	423	if ( ! VISUALIZER_PRO ) {
432	424	if ( ! self::hasChartType( 'gauge' ) ) {
433		- if ( $get2Darray ) {
434		- $deprecated[] = 'gauge';
435		- } else {
436		- $types['gauge']['enabled'] = false;
437		- }
	425	+ $deprecated[] = 'gauge';
438	426	}
439	427	if ( ! self::hasChartType( 'candlestick' ) ) {
440		- if ( $get2Darray ) {
441		- $deprecated[] = 'candlestick';
442		- } else {
443		- $types['candlestick']['enabled'] = false;
444		- }
	428	+ $deprecated[] = 'candlestick';
445	429	}
446	430	}
447	431	}
448	432