| @@ -82,13 +82,8 @@ | ||
| 82 | 82 | ) |
| 83 | 83 | ), |
| 84 | 84 | ); |
| 85 | 85 | $filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); |
| 86 | - if ( empty( $filter ) ) { | |
| 87 | - // 'filter' is from the modal from the add media button. | |
| 88 | - $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING ); | |
| 89 | - } | |
| 90 | - | |
| 91 | 86 | if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) { |
| 92 | 87 | $query_args['meta_query'] = array( |
| 93 | 88 | array( |
| 94 | 89 | 'key' => Visualizer_Plugin::CF_CHART_TYPE, |
| @@ -232,19 +227,15 @@ | ||
| 232 | 227 | $chart_id, Visualizer_Plugin::CF_SETTINGS, array( |
| 233 | 228 | 'focusTarget' => 'datum', |
| 234 | 229 | ) |
| 235 | 230 | ); |
| 236 | - do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); | |
| 237 | 231 | } |
| 238 | 232 | wp_redirect( add_query_arg( 'chart', (int) $chart_id ) ); |
| 239 | 233 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 240 | 234 | } |
| 241 | 235 | // enqueue and register scripts and styles |
| 242 | - wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); | |
| 243 | - wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 244 | - | |
| 245 | - wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION ); | |
| 246 | - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true ); | |
| 236 | + wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION ); | |
| 237 | + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true ); | |
| 247 | 238 | wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 248 | 239 | wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); |
| 249 | 240 | wp_register_script( |
| 250 | 241 | 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( |
| @@ -265,26 +256,17 @@ | ||
| 265 | 256 | $Visualizer_Pro->_addScriptsAndStyles(); |
| 266 | 257 | } |
| 267 | 258 | // dispatch pages |
| 268 | 259 | $this->_chart = get_post( $chart_id ); |
| 269 | - $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer'; | |
| 270 | - | |
| 271 | - // skip chart type pages only for existing charts. | |
| 272 | - if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) { | |
| 273 | - $tab = 'settings'; | |
| 274 | - } | |
| 275 | - | |
| 276 | - switch ( $tab ) { | |
| 260 | + switch ( isset( $_GET['tab'] ) ? $_GET['tab'] : '' ) { | |
| 277 | 261 | case 'settings': |
| 262 | + // changed by Ash/Upwork | |
| 278 | 263 | $this->_handleDataAndSettingsPage(); |
| 279 | 264 | break; |
| 280 | - case 'type': // fall through. | |
| 281 | - case 'visualizer': // fall through. | |
| 265 | + case 'type': | |
| 266 | + default: | |
| 282 | 267 | $this->_handleTypesPage(); |
| 283 | 268 | break; |
| 284 | - default: | |
| 285 | - do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart ); | |
| 286 | - break; | |
| 287 | 269 | } |
| 288 | 270 | defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); |
| 289 | 271 | } |
| 290 | 272 | |
| @@ -330,23 +312,13 @@ | ||
| 330 | 312 | wp_localize_script( |
| 331 | 313 | 'visualizer-render', 'visualizer', array( |
| 332 | 314 | 'l10n' => array( |
| 333 | 315 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 334 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 335 | 316 | ), |
| 336 | 317 | 'charts' => array( |
| 337 | 318 | 'canvas' => $data, |
| 338 | 319 | ), |
| 339 | 320 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 340 | - 'ajax' => array( | |
| 341 | - 'url' => admin_url( 'admin-ajax.php' ), | |
| 342 | - 'nonces' => array( | |
| 343 | - 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ), | |
| 344 | - ), | |
| 345 | - 'actions' => array( | |
| 346 | - 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA, | |
| 347 | - ), | |
| 348 | - ), | |
| 349 | 321 | ) |
| 350 | 322 | ); |
| 351 | 323 | $render = new Visualizer_Render_Page_Data(); |
| 352 | 324 | $render->chart = $this->_chart; |
| @@ -439,14 +411,8 @@ | ||
| 439 | 411 | } |
| 440 | 412 | if ( ! isset( $_POST['vz-import-time'] ) ) { |
| 441 | 413 | apply_filters( 'visualizer_pro_remove_schedule', $chart_id ); |
| 442 | 414 | } |
| 443 | - | |
| 444 | - if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) { | |
| 445 | - // delete the filters in case this chart is being uploaded from other data sources | |
| 446 | - delete_post_meta( $chart_id, 'visualizer-filter-config' ); | |
| 447 | - } | |
| 448 | - | |
| 449 | 415 | $source = null; |
| 450 | 416 | $render = new Visualizer_Render_Page_Update(); |
| 451 | 417 | if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) { |
| 452 | 418 | $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] ); |
| @@ -581,9 +547,8 @@ | ||
| 581 | 547 | wp_localize_script( |
| 582 | 548 | 'visualizer-render', 'visualizer', array( |
| 583 | 549 | 'l10n' => array( |
| 584 | 550 | 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), |
| 585 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 586 | 551 | ), |
| 587 | 552 | 'charts' => array( |
| 588 | 553 | 'canvas' => $data, |
| 589 | 554 | ), |
