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