| @@ -89,9 +89,9 @@ | ||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // Enqueue the bundled block JS file |
| 92 | 92 | wp_enqueue_script( 'handsontable', $handsontableJS ); |
| 93 | - wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true ); | |
| 93 | + wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment', 'lodash' ), $version, true ); | |
| 94 | 94 | |
| 95 | 95 | $type = 'community'; |
| 96 | 96 | |
| 97 | 97 | if ( Visualizer_Module::is_pro() ) { |
| @@ -108,12 +108,17 @@ | ||
| 108 | 108 | 'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'), |
| 109 | 109 | 'absurl' => VISUALIZER_ABSURL, |
| 110 | 110 | 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(), |
| 111 | 111 | 'adminPage' => menu_page_url( 'visualizer', false ), |
| 112 | + 'createChart' => add_query_arg( array( 'action' => 'visualizer-create-chart', 'library' => 'yes', 'type' => '', 'chart-library' => '', 'tab' => 'visualizer' ), admin_url( 'admin-ajax.php' ) ), | |
| 112 | 113 | 'sqlTable' => $table_col_mapping, |
| 113 | 114 | 'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6, |
| 114 | 115 | 'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(), |
| 115 | 116 | 'isFullSiteEditor' => 'site-editor.php' === $pagenow, |
| 117 | + 'legacyBlockEdit' => apply_filters( 'visualizer_legacy_block_edit', false ), | |
| 118 | + /* translators: %1$s: opening tag, %2$s: closing tag */ | |
| 119 | + 'blockEditDoc' => sprintf( __( 'The editor for managing chart settings has been removed from the block editor. You can find more information in this %1$sdocumentation%2$s', 'visualizer' ), '<a href="https://docs.themeisle.com/article/1705-how-can-i-display-a-chart#using-visualizer-block" target="_blank">', '</a>' ), | |
| 120 | + 'chartEditUrl' => admin_url( 'admin-ajax.php' ), | |
| 116 | 121 | ); |
| 117 | 122 | wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array ); |
| 118 | 123 | |
| 119 | 124 | // Enqueue frontend and editor block styles |
| @@ -130,9 +135,9 @@ | ||
| 130 | 135 | 'lineWrapping' => true, |
| 131 | 136 | 'dragDrop' => false, |
| 132 | 137 | 'matchBrackets' => true, |
| 133 | 138 | 'autoCloseBrackets' => true, |
| 134 | - 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ), | |
| 139 | + 'extraKeys' => array( 'Shift-Space' => 'autocomplete' ), | |
| 135 | 140 | 'hintOptions' => array( 'tables' => $table_col_mapping ), |
| 136 | 141 | ), |
| 137 | 142 | ) |
| 138 | 143 | ); |
| @@ -441,10 +446,10 @@ | ||
| 441 | 446 | $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true ); |
| 442 | 447 | |
| 443 | 448 | $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true ); |
| 444 | 449 | |
| 445 | - if ( ! empty( $import ) && ! empty( $schedule ) ) { | |
| 446 | - $data['visualizer-chart-url'] = $import; | |
| 450 | + if ( ! empty( $import ) && $schedule >= 0 ) { | |
| 451 | + $data['visualizer-chart-url'] = $import; | |
| 447 | 452 | $data['visualizer-chart-schedule'] = $schedule; |
| 448 | 453 | } |
| 449 | 454 | |
| 450 | 455 | if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) { |
| @@ -597,9 +602,9 @@ | ||
| 597 | 602 | update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] ); |
| 598 | 603 | update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] ); |
| 599 | 604 | update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] ); |
| 600 | 605 | |
| 601 | - if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) { | |
| 606 | + if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) { | |
| 602 | 607 | $chart_url = esc_url_raw( $data['visualizer-chart-url'] ); |
| 603 | 608 | $chart_schedule = intval( $data['visualizer-chart-schedule'] ); |
| 604 | 609 | update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url ); |
| 605 | 610 | apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule ); |
| @@ -619,8 +624,18 @@ | ||
| 619 | 624 | update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) ); |
| 620 | 625 | } else { |
| 621 | 626 | delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE ); |
| 622 | 627 | delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY ); |
| 628 | + } | |
| 629 | + | |
| 630 | + if ( 'Visualizer_Source_Csv_Remote' === $source_type ) { | |
| 631 | + $schedule_url = $data['visualizer-chart-url']; | |
| 632 | + $schedule_id = $data['visualizer-chart-schedule']; | |
| 633 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $schedule_url ); | |
| 634 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE, $schedule_id ); | |
| 635 | + } else { | |
| 636 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL ); | |
| 637 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE ); | |
| 623 | 638 | } |
| 624 | 639 | } |
| 625 | 640 | |
| 626 | 641 | if ( $source_type === 'Visualizer_Source_Json' ) { |
