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

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