Merge pull request #61 from ideag/patch-1

move loading frontend scripts to the shortcode

Author: anttiviljami

classes/class-cpt-wplf-form.php

@@ -541,6 +541,13 @@ class="libre-form libre-form-<?php echo esc_attr( $id . ' ' . $xclass ); ?>"
 </form>
 <?php
       $output = ob_get_clean();
+
+      wp_enqueue_script( 'wplf-form-js' );
+      wp_localize_script( 'wplf-form-js', 'ajax_object', array(
+        'ajax_url' => admin_url( 'admin-ajax.php' ),
+        'ajax_credentials' => apply_filters( 'wplf_ajax_fetch_credentials_mode', 'same-origin' ),
+      ) );
+
       return $output;
     }
 
@@ -563,16 +570,6 @@ function maybe_enqueue_frontend_script() {
       WPLF_VERSION,
       true
     );
-
-    if ( is_a( $post, 'WP_Post' ) ) {
-      if ( has_shortcode( $post->post_content, 'libre-form' ) || $post->post_type === 'wplf-form' ) {
-        wp_enqueue_script( 'wplf-form-js' );
-        wp_localize_script( 'wplf-form-js', 'ajax_object', array(
-          'ajax_url' => admin_url( 'admin-ajax.php' ),
-          'ajax_credentials' => apply_filters( 'wplf_ajax_fetch_credentials_mode', 'same-origin' ),
-        ) );
-      }
-    }
   }