| @@ -41,16 +41,8 @@ | ||
| 41 | 41 | */ |
| 42 | 42 | private $_charts = array(); |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | - * Lazy render script. | |
| 46 | - * | |
| 47 | - * @access private | |
| 48 | - * @var bool | |
| 49 | - */ | |
| 50 | - private $lazy_render_script = false; | |
| 51 | - | |
| 52 | - /** | |
| 53 | 45 | * Constructor. |
| 54 | 46 | * |
| 55 | 47 | * @since 1.0.0 |
| 56 | 48 | * @uses add_filter() To add "do_shortcode" hook for "widget_text" and "term_description" filters. |
| @@ -60,12 +52,9 @@ | ||
| 60 | 52 | */ |
| 61 | 53 | public function __construct( Visualizer_Plugin $plugin ) { |
| 62 | 54 | parent::__construct( $plugin ); |
| 63 | 55 | |
| 64 | - $this->_addAction( 'wp_print_footer_scripts', 'printFooterScripts' ); | |
| 65 | 56 | $this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' ); |
| 66 | - $this->_addAction( 'load-index.php', 'enqueueScripts' ); | |
| 67 | - $this->_addAction( 'load-visualizer_page_visualizer-setup-wizard', 'enqueueScripts' ); | |
| 68 | 57 | $this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' ); |
| 69 | 58 | $this->_addFilter( 'visualizer_get_language', 'getLanguage' ); |
| 70 | 59 | $this->_addShortcode( 'visualizer', 'renderChart' ); |
| 71 | 60 | |
| @@ -90,34 +79,16 @@ | ||
| 90 | 79 | function script_loader_tag( $tag, $handle, $src ) { |
| 91 | 80 | if ( is_admin() ) { |
| 92 | 81 | return $tag; |
| 93 | 82 | } |
| 94 | - // Async scripts. | |
| 95 | - $async_scripts = array( 'google-jsapi', 'chartjs', 'visualizer-datatables' ); | |
| 96 | - foreach ( $async_scripts as $async ) { | |
| 83 | + | |
| 84 | + $scripts = array( 'google-jsapi', 'visualizer-render-google-lib', 'visualizer-render-google' ); | |
| 85 | + | |
| 86 | + foreach ( $scripts as $async ) { | |
| 97 | 87 | if ( $async === $handle ) { |
| 98 | - $tag = str_replace( ' src', ' async src', $tag ); | |
| 88 | + $tag = str_replace( ' src', ' defer="defer" src', $tag ); | |
| 99 | 89 | break; |
| 100 | 90 | } |
| 101 | - }; | |
| 102 | - | |
| 103 | - // Async scripts. | |
| 104 | - $scripts = array( 'dom-to-image' ); | |
| 105 | - foreach ( array( 'async', 'defer' ) as $attr ) { | |
| 106 | - if ( wp_scripts()->get_data( $handle, $attr ) ) { | |
| 107 | - break; | |
| 108 | - } | |
| 109 | - if ( in_array( $handle, $async_scripts, true ) || false === strpos( $handle, 'visualizer-' ) ) { | |
| 110 | - break; | |
| 111 | - } | |
| 112 | - if ( ! preg_match( ":\s$attr(=|>|\s):", $tag ) ) { | |
| 113 | - $tag = preg_replace( ':(?=></script>):', " $attr", $tag, 1 ); | |
| 114 | - if ( $this->lazy_render_script ) { | |
| 115 | - $tag = str_replace( ' src', ' data-visualizer-script', $tag ); | |
| 116 | - } | |
| 117 | - } | |
| 118 | - // Only allow async or defer, not both. | |
| 119 | - break; | |
| 120 | 91 | } |
| 121 | 92 | return $tag; |
| 122 | 93 | } |
| 123 | 94 | |
| @@ -271,8 +242,9 @@ | ||
| 271 | 242 | * @access public |
| 272 | 243 | */ |
| 273 | 244 | public function enqueueScripts() { |
| 274 | 245 | wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true ); |
| 246 | + wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION ); | |
| 275 | 247 | do_action( 'visualizer_pro_frontend_load_resources' ); |
| 276 | 248 | } |
| 277 | 249 | |
| 278 | 250 | /** |
| @@ -304,44 +276,18 @@ | ||
| 304 | 276 | 'use_image' => 'no', |
| 305 | 277 | ), |
| 306 | 278 | $atts |
| 307 | 279 | ); |
| 308 | - | |
| 309 | - $atts['id'] = (int) $atts['id']; | |
| 310 | - $atts['class'] = esc_attr( $atts['class'] ); | |
| 311 | - $atts['lazy'] = esc_attr( $atts['lazy'] ); | |
| 312 | - $atts['use_image'] = esc_attr( $atts['use_image'] ); | |
| 313 | - | |
| 314 | - global $sitepress; | |
| 315 | - if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) { | |
| 316 | - global $sitepress; | |
| 317 | - $locale = icl_get_current_language(); | |
| 318 | - $locale = strtolower( str_replace( '_', '-', $locale ) ); | |
| 319 | - $trid = $sitepress->get_element_trid( $atts['id'], 'post_' . Visualizer_Plugin::CPT_VISUALIZER ); | |
| 320 | - $translations = $sitepress->get_element_translations( $trid ); | |
| 321 | - if ( isset( $translations[ $locale ] ) && is_object( $translations[ $locale ] ) ) { | |
| 322 | - $atts['id'] = $translations[ $locale ]->element_id; | |
| 323 | - } | |
| 324 | - } | |
| 325 | - | |
| 326 | - $chart_data = $this->getChartData( Visualizer_Plugin::CF_CHART_CACHE, $atts['id'] ); | |
| 327 | - // if empty chart does not exists, then return empty string. | |
| 328 | - if ( ! $chart_data ) { | |
| 280 | + // if empty id or chart does not exists, then return empty string | |
| 281 | + if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 329 | 282 | return ''; |
| 330 | 283 | } |
| 331 | 284 | |
| 332 | - $chart = $chart_data['chart']; | |
| 333 | - $type = $chart_data['type']; | |
| 334 | - $series = $chart_data['series']; | |
| 335 | 285 | // do not show the chart? |
| 336 | 286 | if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) { |
| 337 | 287 | return ''; |
| 338 | 288 | } |
| 339 | 289 | |
| 340 | - if ( ! is_admin() && ! empty( $chart_data['is_woocommerce_report'] ) ) { | |
| 341 | - return ''; | |
| 342 | - } | |
| 343 | - | |
| 344 | 290 | // in case revisions exist. |
| 345 | 291 | // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found |
| 346 | 292 | if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) { |
| 347 | 293 | $chart = get_post( $chart->ID ); |
| @@ -362,33 +308,24 @@ | ||
| 362 | 308 | if ( ctype_digit( $atts['lazy'] ) ) { |
| 363 | 309 | $attributes['data-lazy-limit'] = $atts['lazy']; |
| 364 | 310 | } |
| 365 | 311 | |
| 366 | - $attributes = apply_filters( 'visualizer_container_attributes', $attributes, $chart->ID ); | |
| 312 | + $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 367 | 313 | |
| 368 | 314 | $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false ); |
| 369 | 315 | |
| 370 | - // Get and update settings. | |
| 371 | - $settings = $chart_data['settings']; | |
| 372 | - $settings = ! empty( $settings ) ? $settings : array(); | |
| 316 | + // fetch and update settings | |
| 317 | + $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 373 | 318 | if ( empty( $settings['height'] ) ) { |
| 374 | 319 | $settings['height'] = '400'; |
| 375 | 320 | } |
| 376 | 321 | |
| 377 | 322 | // handle series filter hooks |
| 378 | - $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, $series, $chart->ID, $type ); | |
| 323 | + $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); | |
| 379 | 324 | |
| 380 | 325 | // handle settings filter hooks |
| 381 | 326 | $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type ); |
| 382 | 327 | |
| 383 | - $lazy_load = isset( $settings['lazy_load_chart'] ) ? $settings['lazy_load_chart'] : false; | |
| 384 | - $lazy_load = apply_filters( 'visualizer_lazy_load_chart', $lazy_load, $chart->ID ); | |
| 385 | - $container_class = 'visualizer-front-container'; | |
| 386 | - if ( $lazy_load ) { | |
| 387 | - $this->lazy_render_script = true; | |
| 388 | - $container_class .= ' visualizer-lazy-render'; | |
| 389 | - } | |
| 390 | - | |
| 391 | 328 | // handle data filter hooks |
| 392 | 329 | $data = self::get_chart_data( $chart, $type ); |
| 393 | 330 | |
| 394 | 331 | $css = ''; |
| @@ -407,31 +344,14 @@ | ||
| 407 | 344 | return '<div data-amp-auto-lightbox-disable id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '>' . $amp->get_chart( $chart, $data, $series, $settings ) . '</div>'; |
| 408 | 345 | } |
| 409 | 346 | |
| 410 | 347 | if ( 'yes' === $atts['use_image'] ) { |
| 411 | - $chart_image = $chart_data['chart_image']; | |
| 348 | + $chart_image = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ); | |
| 412 | 349 | if ( $chart_image ) { |
| 413 | 350 | return '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '>' . wp_get_attachment_image( $chart_image, 'full' ) . '</div>'; |
| 414 | 351 | } |
| 415 | 352 | } |
| 416 | - // Unset chart image base64 string. | |
| 417 | - if ( isset( $settings['chart-img'] ) ) { | |
| 418 | - unset( $settings['chart-img'] ); | |
| 419 | - } | |
| 420 | 353 | |
| 421 | - $enable_controls = false; | |
| 422 | - if ( isset( $settings['controls'] ) && ! empty( $settings['controls']['controlType'] ) ) { | |
| 423 | - $column_index = $settings['controls']['filterColumnIndex']; | |
| 424 | - $column_label = $settings['controls']['filterColumnLabel']; | |
| 425 | - if ( 'false' !== $column_index || 'false' !== $column_label ) { | |
| 426 | - $enable_controls = true; | |
| 427 | - } | |
| 428 | - } | |
| 429 | - | |
| 430 | - if ( ! $enable_controls ) { | |
| 431 | - unset( $settings['controls'] ); | |
| 432 | - } | |
| 433 | - | |
| 434 | 354 | // add chart to the array |
| 435 | 355 | $this->_charts[ $id ] = array( |
| 436 | 356 | 'type' => $type, |
| 437 | 357 | 'series' => $series, |
| @@ -471,55 +391,40 @@ | ||
| 471 | 391 | } |
| 472 | 392 | |
| 473 | 393 | $actions_div .= $css; |
| 474 | 394 | |
| 475 | - $_charts = array(); | |
| 476 | - $_charts_type = ''; | |
| 477 | - $count = 0; | |
| 478 | 395 | foreach ( $this->_charts as $id => $array ) { |
| 479 | - $_charts = $this->_charts; | |
| 480 | 396 | $library = $array['library']; |
| 481 | - $_charts_type = $library; | |
| 482 | - if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) { | |
| 483 | - wp_register_script( | |
| 484 | - "visualizer-render-$library", | |
| 485 | - VISUALIZER_ABSURL . 'js/render-facade.js', | |
| 486 | - apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ), | |
| 487 | - Visualizer_Plugin::VERSION, | |
| 488 | - true | |
| 489 | - ); | |
| 490 | - wp_enqueue_script( "visualizer-render-$library" ); | |
| 491 | - } | |
| 397 | + wp_register_script( | |
| 398 | + "visualizer-render-$library", | |
| 399 | + VISUALIZER_ABSURL . 'js/render-facade.js', | |
| 400 | + apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ), | |
| 401 | + Visualizer_Plugin::VERSION, | |
| 402 | + true | |
| 403 | + ); | |
| 492 | 404 | |
| 493 | - if ( wp_script_is( "visualizer-render-$_charts_type" ) && 0 === $count ) { | |
| 494 | - wp_localize_script( | |
| 495 | - "visualizer-render-$_charts_type", | |
| 496 | - 'visualizer', | |
| 497 | - array( | |
| 498 | - 'charts' => $this->_charts, | |
| 499 | - 'language' => $this->get_language(), | |
| 500 | - 'map_api_key' => get_option( 'visualizer-map-api-key' ), | |
| 501 | - 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '', | |
| 502 | - 'wp_nonce' => wp_create_nonce( 'wp_rest' ), | |
| 503 | - 'i10n' => array( | |
| 504 | - 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ), | |
| 505 | - ), | |
| 506 | - 'page_type' => 'frontend', | |
| 507 | - 'is_front' => true, | |
| 508 | - ) | |
| 509 | - ); | |
| 510 | - } | |
| 511 | - $count++; | |
| 405 | + wp_enqueue_script( "visualizer-render-$library" ); | |
| 406 | + wp_localize_script( | |
| 407 | + "visualizer-render-$library", | |
| 408 | + 'visualizer', | |
| 409 | + array( | |
| 410 | + 'charts' => $this->_charts, | |
| 411 | + 'language' => $this->get_language(), | |
| 412 | + 'map_api_key' => get_option( 'visualizer-map-api-key' ), | |
| 413 | + 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '', | |
| 414 | + 'wp_nonce' => wp_create_nonce( 'wp_rest' ), | |
| 415 | + 'i10n' => array( | |
| 416 | + 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ), | |
| 417 | + ), | |
| 418 | + 'page_type' => 'frontend', | |
| 419 | + 'is_front' => true, | |
| 420 | + ) | |
| 421 | + ); | |
| 422 | + wp_enqueue_style( 'visualizer-front' ); | |
| 512 | 423 | } |
| 513 | - $prefix = 'C' . 'h' . 'a' . 'rt'; | |
| 514 | - if ( $type === 'tabular' ) { | |
| 515 | - $prefix = 'T' . 'a' . 'bl' . 'e'; | |
| 516 | - } | |
| 517 | - if ( Visualizer_Module::is_pro() && $enable_controls ) { | |
| 518 | - $actions_div .= '<div id="control_wrapper_' . $id . '"></div>'; | |
| 519 | - } | |
| 424 | + | |
| 520 | 425 | // return placeholder div |
| 521 | - return '<div class="' . $container_class . '" id="chart_wrapper_' . $id . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . '</div>'; | |
| 426 | + return $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ); | |
| 522 | 427 | } |
| 523 | 428 | |
| 524 | 429 | /** |
| 525 | 430 | * Converts the array of attributes to a string of HTML attributes. |
| @@ -534,9 +439,9 @@ | ||
| 534 | 439 | return $string; |
| 535 | 440 | } |
| 536 | 441 | |
| 537 | 442 | foreach ( $attributes as $name => $value ) { |
| 538 | - $string .= sprintf( ' %s="%s"', esc_attr( $name ), esc_attr( $value ) ); | |
| 443 | + $string .= sprintf( '%s="%s"', esc_attr( $name ), esc_attr( $value ) ); | |
| 539 | 444 | } |
| 540 | 445 | return $string; |
| 541 | 446 | } |
| 542 | 447 | |
| @@ -637,110 +542,6 @@ | ||
| 637 | 542 | return ''; |
| 638 | 543 | } |
| 639 | 544 | |
| 640 | 545 | return '<script type="application/ld+json">' . $schema . '</script>'; |
| 641 | - } | |
| 642 | - | |
| 643 | - /** | |
| 644 | - * Get chart by ID. | |
| 645 | - * | |
| 646 | - * @param string $cache_key Cache key. | |
| 647 | - * @param int $chart_id Chart ID. | |
| 648 | - * @return mixed | |
| 649 | - */ | |
| 650 | - private function getChartData( $cache_key = '', $chart_id = 0 ) { | |
| 651 | - if ( ! $chart_id ) { | |
| 652 | - return false; | |
| 653 | - } | |
| 654 | - // Create unique cache key of each chart. | |
| 655 | - $cache_key .= '_' . $chart_id; | |
| 656 | - // Get chart from cache. | |
| 657 | - $chart = get_transient( $cache_key ); | |
| 658 | - if ( $chart ) { | |
| 659 | - return $chart; | |
| 660 | - } | |
| 661 | - | |
| 662 | - // Get chart by ID. | |
| 663 | - $chart = get_post( $chart_id ); | |
| 664 | - if ( $chart && Visualizer_Plugin::CPT_VISUALIZER === $chart->post_type ) { | |
| 665 | - $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); | |
| 666 | - $series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ); | |
| 667 | - $is_woocommerce_report = get_post_meta( $chart->ID, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true ); | |
| 668 | - | |
| 669 | - if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) { | |
| 670 | - $diff_total_series = abs( count( $settings['series'] ) - count( $series ) ); | |
| 671 | - if ( $diff_total_series ) { | |
| 672 | - foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) { | |
| 673 | - $settings['series'][] = end( $settings['series'] ); | |
| 674 | - } | |
| 675 | - } | |
| 676 | - } | |
| 677 | - $chart_data = array( | |
| 678 | - 'chart' => $chart, | |
| 679 | - 'type' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ), | |
| 680 | - 'settings' => $settings, | |
| 681 | - 'series' => $series, | |
| 682 | - 'chart_image' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_IMAGE, true ), | |
| 683 | - 'is_woocommerce_report' => $is_woocommerce_report, | |
| 684 | - ); | |
| 685 | - | |
| 686 | - // Put the results in a transient. Expire after 12 hours. | |
| 687 | - set_transient( $cache_key, $chart_data, apply_filters( Visualizer_Plugin::FILTER_HANDLE_CACHE_EXPIRATION_TIME, 12 * HOUR_IN_SECONDS ) ); | |
| 688 | - return $chart_data; | |
| 689 | - } | |
| 690 | - | |
| 691 | - return false; | |
| 692 | - } | |
| 693 | - | |
| 694 | - /** | |
| 695 | - * Print footer script. | |
| 696 | - */ | |
| 697 | - public function printFooterScripts() { | |
| 698 | - if ( $this->lazy_render_script ) { | |
| 699 | - ?> | |
| 700 | - <script type="text/javascript"> | |
| 701 | - var visualizerUserInteractionEvents = [ | |
| 702 | - "mouseover", | |
| 703 | - "keydown", | |
| 704 | - "touchmove", | |
| 705 | - "touchstart" | |
| 706 | - ]; | |
| 707 | - | |
| 708 | - visualizerUserInteractionEvents.forEach(function(event) { | |
| 709 | - window.addEventListener(event, visualizerTriggerScriptLoader, { passive: true }); | |
| 710 | - }); | |
| 711 | - | |
| 712 | - function visualizerTriggerScriptLoader() { | |
| 713 | - visualizerLoadScripts(); | |
| 714 | - visualizerUserInteractionEvents.forEach(function(event) { | |
| 715 | - window.removeEventListener(event, visualizerTriggerScriptLoader, { passive: true }); | |
| 716 | - }); | |
| 717 | - } | |
| 718 | - | |
| 719 | - function visualizerLoadScripts() { | |
| 720 | - document.querySelectorAll("script[data-visualizer-script]").forEach(function(elem) { | |
| 721 | - jQuery.getScript( elem.getAttribute("data-visualizer-script") ) | |
| 722 | - .done( function( script, textStatus ) { | |
| 723 | - elem.setAttribute("src", elem.getAttribute("data-visualizer-script")); | |
| 724 | - elem.removeAttribute("data-visualizer-script"); | |
| 725 | - setTimeout( function() { | |
| 726 | - visualizerRefreshChart(); | |
| 727 | - } ); | |
| 728 | - } ); | |
| 729 | - }); | |
| 730 | - } | |
| 731 | - | |
| 732 | - function visualizerRefreshChart() { | |
| 733 | - jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize(); | |
| 734 | - if ( jQuery( 'div.viz-facade-loaded:not(.visualizer-lazy):empty' ).length > 0 ) { | |
| 735 | - visualizerUserInteractionEvents.forEach( function( event ) { | |
| 736 | - window.addEventListener( event, function() { | |
| 737 | - jQuery( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize(); | |
| 738 | - }, { passive: true } ); | |
| 739 | - } ); | |
| 740 | - } | |
| 741 | - } | |
| 742 | - </script> | |
| 743 | - <?php | |
| 744 | - } | |
| 745 | 546 | } |
| 746 | 547 | } |
