| @@ -731,10 +731,8 @@ | ||
| 731 | 731 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 732 | 732 | |
| 733 | 733 | global $pagenow; |
| 734 | 734 | if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { |
| 735 | - self::enqueue_global_settings_scripts( $page ); | |
| 736 | - | |
| 737 | 735 | wp_enqueue_script( 'admin-widgets' ); |
| 738 | 736 | wp_enqueue_style( 'widgets' ); |
| 739 | 737 | self::maybe_deregister_popper2(); |
| 740 | 738 | wp_enqueue_script( 'formidable_admin' ); |
| @@ -785,46 +783,11 @@ | ||
| 785 | 783 | if ( 'formidable-addons' === $page ) { |
| 786 | 784 | wp_register_script( 'formidable_addons', $plugin_url . '/js/admin/addons.js', array( 'formidable_admin', 'wp-dom-ready' ), $version, true ); |
| 787 | 785 | wp_enqueue_script( 'formidable_addons' ); |
| 788 | 786 | } |
| 789 | - | |
| 790 | - self::enqueue_builder_assets( $plugin_url, $version ); | |
| 791 | 787 | } |
| 792 | 788 | |
| 793 | 789 | /** |
| 794 | - * Enqueue the Form Builder assets. | |
| 795 | - * | |
| 796 | - * @since 6.24 | |
| 797 | - * | |
| 798 | - * @param string $plugin_url The plugin URL. | |
| 799 | - * @param string $version The plugin version. | |
| 800 | - * @return void | |
| 801 | - */ | |
| 802 | - private static function enqueue_builder_assets( $plugin_url, $version ) { | |
| 803 | - wp_register_style( 'formidable-settings-components', $plugin_url . '/css/admin/frm-settings-components.css', array( 'formidable-admin', 'formidable-grids' ), $version ); | |
| 804 | - wp_register_script( 'formidable-settings-components', $plugin_url . '/js/formidable-settings-components.js', array( 'formidable_admin' ), $version, true ); | |
| 805 | - | |
| 806 | - if ( ! FrmAppHelper::is_form_builder_page() ) { | |
| 807 | - return; | |
| 808 | - } | |
| 809 | - | |
| 810 | - wp_enqueue_style( 'formidable-settings-components' ); | |
| 811 | - wp_enqueue_script( 'formidable-settings-components' ); | |
| 812 | - } | |
| 813 | - | |
| 814 | - /** | |
| 815 | - * Enqueues global settings scripts. | |
| 816 | - * | |
| 817 | - * @param string $page The `page` param in URL. | |
| 818 | - */ | |
| 819 | - private static function enqueue_global_settings_scripts( $page ) { | |
| 820 | - if ( 'formidable-settings' === $page ) { | |
| 821 | - wp_enqueue_style( 'wp-color-picker' ); | |
| 822 | - wp_enqueue_script( 'formidable_settings' ); | |
| 823 | - } | |
| 824 | - } | |
| 825 | - | |
| 826 | - /** | |
| 827 | 790 | * Avoid loading dropzone CSS on the form list page. It isn't required there. |
| 828 | 791 | * |
| 829 | 792 | * @since 6.11 |
| 830 | 793 | * |
| @@ -1044,9 +1007,9 @@ | ||
| 1044 | 1007 | public static function create_rest_routes() { |
| 1045 | 1008 | $args = array( |
| 1046 | 1009 | 'methods' => 'GET', |
| 1047 | 1010 | 'callback' => 'FrmAppController::api_install', |
| 1048 | - 'permission_callback' => self::class . '::can_update_db', | |
| 1011 | + 'permission_callback' => __CLASS__ . '::can_update_db', | |
| 1049 | 1012 | ); |
| 1050 | 1013 | |
| 1051 | 1014 | register_rest_route( 'frm-admin/v1', '/install', $args ); |
| 1052 | 1015 | |
