| @@ -18,36 +18,51 @@ | ||
| 18 | 18 | return null; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | wp_enqueue_script("jquery-effects-core"); |
| 22 | - wp_enqueue_script('ays_block_select2js', POLL_MAKER_AYS_ADMIN_URL . '/js/select2.min.js', array('jquery'), '4.0.6', true); | |
| 23 | - wp_enqueue_script(POLL_MAKER_AYS_NAME . '-autosize', POLL_MAKER_AYS_PUBLIC_URL . '/js/poll-maker-autosize.js', array( 'jquery' ), POLL_MAKER_AYS_VERSION, false ); | |
| 24 | - wp_enqueue_script(POLL_MAKER_AYS_NAME, POLL_MAKER_AYS_PUBLIC_URL . '/js/poll-maker-ays-public.js', array('jquery'), POLL_MAKER_AYS_VERSION, false); | |
| 22 | + wp_enqueue_script('ays_block_select2js', esc_url(POLL_MAKER_AYS_ADMIN_URL) . '/js/select2.min.js', array('jquery'), '4.0.6', true); | |
| 23 | + wp_enqueue_script(POLL_MAKER_AYS_NAME . '-autosize', esc_url(POLL_MAKER_AYS_PUBLIC_URL) . '/js/poll-maker-autosize.js', array( 'jquery' ), POLL_MAKER_AYS_VERSION, false ); | |
| 24 | + wp_enqueue_script(POLL_MAKER_AYS_NAME, esc_url(POLL_MAKER_AYS_PUBLIC_URL) . '/js/poll-maker-ays-public.js', array('jquery'), POLL_MAKER_AYS_VERSION, false); | |
| 25 | 25 | wp_localize_script(POLL_MAKER_AYS_NAME . '-ajax-public', 'poll_maker_ajax_public', array('ajax_url' => admin_url('admin-ajax.php'))); |
| 26 | 26 | |
| 27 | 27 | // Enqueue the bundled block JS file |
| 28 | - if( $versionCompare ){ | |
| 29 | - wp_enqueue_script( | |
| 30 | - 'poll-maker-block-js', | |
| 31 | - POLL_MAKER_AYS_BASE_URL ."/poll/poll-maker-block-new.js", | |
| 32 | - array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-components', 'wp-editor' ), | |
| 33 | - POLL_MAKER_AYS_VERSION, true | |
| 34 | - ); | |
| 28 | + $dependencies = array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-components' ); | |
| 29 | + | |
| 30 | + if ( ! ( defined( 'WP_CUSTOMIZE_WIDGETS' ) && WP_CUSTOMIZE_WIDGETS ) && ! did_action( 'enqueue_block_editor_assets' ) ) { | |
| 31 | + $dependencies[] = 'wp-editor'; | |
| 35 | 32 | } |
| 36 | - else{ | |
| 37 | - wp_enqueue_script( | |
| 38 | - 'poll-maker-block-js', | |
| 39 | - POLL_MAKER_AYS_BASE_URL ."/poll/poll-maker-block.js", | |
| 40 | - array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-components', 'wp-editor' ), | |
| 41 | - POLL_MAKER_AYS_VERSION, true | |
| 42 | - ); | |
| 43 | - } | |
| 33 | + | |
| 34 | + wp_enqueue_script( | |
| 35 | + 'poll-maker-block-js', | |
| 36 | + POLL_MAKER_AYS_BASE_URL . ($versionCompare ? "/poll/poll-maker-block-new.js" : "/poll/poll-maker-block.js"), | |
| 37 | + $dependencies, | |
| 38 | + POLL_MAKER_AYS_VERSION, | |
| 39 | + true | |
| 40 | + ); | |
| 41 | + | |
| 42 | + // if( $versionCompare ){ | |
| 43 | + // wp_enqueue_script( | |
| 44 | + // 'poll-maker-block-js', | |
| 45 | + // POLL_MAKER_AYS_BASE_URL ."/poll/poll-maker-block-new.js", | |
| 46 | + // array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-components', 'wp-editor' ), | |
| 47 | + // POLL_MAKER_AYS_VERSION, true | |
| 48 | + // ); | |
| 49 | + // } | |
| 50 | + // else{ | |
| 51 | + // wp_enqueue_script( | |
| 52 | + // 'poll-maker-block-js', | |
| 53 | + // POLL_MAKER_AYS_BASE_URL ."/poll/poll-maker-block.js", | |
| 54 | + // array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-components', 'wp-editor' ), | |
| 55 | + // POLL_MAKER_AYS_VERSION, true | |
| 56 | + // ); | |
| 57 | + // } | |
| 58 | + | |
| 44 | 59 | wp_localize_script('ays-poll-gutenberg-block-js', 'ays_poll_block_ajax', array('aysDoShortCode' => admin_url('admin-ajax.php'))); |
| 45 | 60 | |
| 46 | - wp_enqueue_style( POLL_MAKER_AYS_NAME . '-font-awesome', POLL_MAKER_AYS_ADMIN_URL . '/css/poll-maker-font-awesome-all.css', array(), POLL_MAKER_AYS_VERSION, 'all'); | |
| 47 | - wp_enqueue_style('ays-block-animate', POLL_MAKER_AYS_ADMIN_URL . '/css/animate.min.css', array(), '2.0.6', 'all'); | |
| 48 | - wp_enqueue_style('ays-block-select2', POLL_MAKER_AYS_ADMIN_URL . '/css/select2.min.css', array(), '4.0.6', 'all'); | |
| 49 | - wp_enqueue_style(POLL_MAKER_AYS_NAME, POLL_MAKER_AYS_PUBLIC_URL . '/css/poll-maker-ays-public.css', array(), POLL_MAKER_AYS_VERSION, 'all'); | |
| 61 | + wp_enqueue_style( POLL_MAKER_AYS_NAME . '-font-awesome', esc_url(POLL_MAKER_AYS_ADMIN_URL) . '/css/poll-maker-font-awesome-all.css', array(), POLL_MAKER_AYS_VERSION, 'all'); | |
| 62 | + wp_enqueue_style('ays-block-animate', esc_url(POLL_MAKER_AYS_ADMIN_URL) . '/css/animate.min.css', array(), '2.0.6', 'all'); | |
| 63 | + wp_enqueue_style('ays-block-select2', esc_url(POLL_MAKER_AYS_ADMIN_URL) . '/css/select2.min.css', array(), '4.0.6', 'all'); | |
| 64 | + wp_enqueue_style(POLL_MAKER_AYS_NAME, esc_url(POLL_MAKER_AYS_PUBLIC_URL) . '/css/poll-maker-ays-public.css', array(), POLL_MAKER_AYS_VERSION, 'all'); | |
| 50 | 65 | |
| 51 | 66 | // Enqueue the bundled block CSS file |
| 52 | 67 | if( $versionCompare ){ |
| 53 | 68 | wp_enqueue_style( |
