| @@ -219,9 +219,11 @@ | ||
| 219 | 219 | wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true ); |
| 220 | 220 | wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true ); |
| 221 | 221 | wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true ); |
| 222 | 222 | wp_localize_script( |
| 223 | - 'visualizer-media-view', 'visualizer', array( | |
| 223 | + 'visualizer-media-view', | |
| 224 | + 'visualizer', | |
| 225 | + array( | |
| 224 | 226 | 'i10n' => array( |
| 225 | 227 | 'insert' => __( 'Insert', 'visualizer' ), |
| 226 | 228 | ), |
| 227 | 229 | ) |
| @@ -285,9 +287,10 @@ | ||
| 285 | 287 | ); |
| 286 | 288 | } |
| 287 | 289 | |
| 288 | 290 | $types = array_merge( |
| 289 | - $additional, array( | |
| 291 | + $additional, | |
| 292 | + array( | |
| 290 | 293 | 'pie' => array( |
| 291 | 294 | 'name' => esc_html__( 'Pie', 'visualizer' ), |
| 292 | 295 | 'enabled' => true, |
| 293 | 296 | ), |
| @@ -402,20 +405,30 @@ | ||
| 402 | 405 | wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION ); |
| 403 | 406 | $this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' ); |
| 404 | 407 | wp_enqueue_media(); |
| 405 | 408 | wp_enqueue_script( |
| 406 | - 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( | |
| 409 | + 'visualizer-library', | |
| 410 | + VISUALIZER_ABSURL . 'js/library.js', | |
| 411 | + array( | |
| 407 | 412 | 'jquery', |
| 408 | 413 | 'media-views', |
| 409 | - ), Visualizer_Plugin::VERSION, true | |
| 414 | + ), | |
| 415 | + Visualizer_Plugin::VERSION, | |
| 416 | + true | |
| 410 | 417 | ); |
| 411 | 418 | wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 412 | 419 | wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); |
| 420 | + wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true ); | |
| 413 | 421 | wp_enqueue_script( |
| 414 | - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 422 | + 'visualizer-render', | |
| 423 | + VISUALIZER_ABSURL . 'js/render.js', | |
| 424 | + array( | |
| 415 | 425 | 'google-jsapi-old', |
| 416 | 426 | 'visualizer-library', |
| 417 | - ), Visualizer_Plugin::VERSION, true | |
| 427 | + 'visualizer-customization', | |
| 428 | + ), | |
| 429 | + Visualizer_Plugin::VERSION, | |
| 430 | + true | |
| 418 | 431 | ); |
| 419 | 432 | } |
| 420 | 433 | } |
| 421 | 434 | |
| @@ -458,9 +471,12 @@ | ||
| 458 | 471 | */ |
| 459 | 472 | public function renderLibraryPage() { |
| 460 | 473 | // get current page |
| 461 | 474 | $page = filter_input( |
| 462 | - INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array( | |
| 475 | + INPUT_GET, | |
| 476 | + 'vpage', | |
| 477 | + FILTER_VALIDATE_INT, | |
| 478 | + array( | |
| 463 | 479 | 'options' => array( |
| 464 | 480 | 'min_range' => 1, |
| 465 | 481 | 'default' => 1, |
| 466 | 482 | ), |
| @@ -524,9 +540,11 @@ | ||
| 524 | 540 | } |
| 525 | 541 | // enqueue charts array |
| 526 | 542 | $ajaxurl = admin_url( 'admin-ajax.php' ); |
| 527 | 543 | wp_localize_script( |
| 528 | - 'visualizer-library', 'visualizer', array( | |
| 544 | + 'visualizer-library', | |
| 545 | + 'visualizer', | |
| 546 | + array( | |
| 529 | 547 | 'language' => $this->get_language(), |
| 530 | 548 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 531 | 549 | 'charts' => $charts, |
| 532 | 550 | 'urls' => array( |
| @@ -535,15 +553,17 @@ | ||
| 535 | 553 | array( |
| 536 | 554 | 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, |
| 537 | 555 | 'library' => 'yes', |
| 538 | 556 | 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', |
| 539 | - ), $ajaxurl | |
| 557 | + ), | |
| 558 | + $ajaxurl | |
| 540 | 559 | ), |
| 541 | 560 | 'edit' => add_query_arg( |
| 542 | 561 | array( |
| 543 | 562 | 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, |
| 544 | 563 | 'library' => 'yes', |
| 545 | - ), $ajaxurl | |
| 564 | + ), | |
| 565 | + $ajaxurl | |
| 546 | 566 | ), |
| 547 | 567 | ), |
| 548 | 568 | ) |
| 549 | 569 | ); |
