diff --git a/plugins/fipf_wp_plugin/fipf_wp_hooks.php b/plugins/fipf_wp_plugin/fipf_wp_hooks.php index bc2c154..e23f699 100644 --- a/plugins/fipf_wp_plugin/fipf_wp_hooks.php +++ b/plugins/fipf_wp_plugin/fipf_wp_hooks.php @@ -26,16 +26,23 @@ include_once(dirname(__FILE__) . '/utils/create_html.php'); function main_shortcode() { - # send styles files by name, without extension .css - add_css_to_front( array( - "mystyle", - )); +# # send styles files by name, without extension .css +# add_css_to_front( array( +# "mystyle", +# )); +# +# # send scripts files by name, without extension .js +# add_scripts_to_front( array( +# "myscript", +# "myscript2", +# "myscript3", +# )); - # send scripts files by name, without extension .js - add_scripts_to_front( array( - "myscript", - "myscript2", - "myscript3", + add_files_to_front( array( + "mystyle.css", + "myscript.js", + "myscript2.js", + "myscript3.js", )); diff --git a/plugins/fipf_wp_plugin/styles/mystyle.css b/plugins/fipf_wp_plugin/styles/mystyle.css index c8f2bc9..bb45018 100644 --- a/plugins/fipf_wp_plugin/styles/mystyle.css +++ b/plugins/fipf_wp_plugin/styles/mystyle.css @@ -1,3 +1,3 @@ .has-text-align-center.wp-block-post-title { - border: 1px solid green; + border: 1px solid red; } diff --git a/plugins/fipf_wp_plugin/utils/add_to_front.php b/plugins/fipf_wp_plugin/utils/add_to_front.php index 58dbe25..4189b99 100644 --- a/plugins/fipf_wp_plugin/utils/add_to_front.php +++ b/plugins/fipf_wp_plugin/utils/add_to_front.php @@ -1,33 +1,33 @@ , /url/to/file, [depends on], version, media ); - $dir_path = 'styles/'; - $file_ext = '.css'; - - $previous_file = ''; - foreach ($style_files_arr as $file) { - $file_url = plugin_dir_url(__DIR__).$dir_path.$file.$file_ext; - $file_path = plugin_dir_path(__DIR__).$dir_path.$file.$file_ext; - $file_version = date("ymd-Gis", filemtime($file_path)); - wp_enqueue_style( $file, $file_url, $previous_file, $file_version, ''); - $previous_file = $file; - } -} - -function add_scripts_to_front($script_files_arr) { +function add_files_to_front($files_arr) { //wp_enqueue_script(, /url/to/file, [depends on], version, defer? ); - $dir_path = 'scripts/'; - $file_ext = '.js'; + //wp_enqueue_style( , /url/to/file, [depends on], version, media ); - $previous_file = ''; - foreach ($script_files_arr as $file) { - $file_url = plugin_dir_url(__DIR__).$dir_path.$file.$file_ext; - $file_path = plugin_dir_path(__DIR__).$dir_path.$file.$file_ext; + $previous_css_basename = ''; + $previous_js_basename = ''; + foreach ($files_arr as $file) { + $file_ext = pathinfo($file, PATHINFO_EXTENSION); + $file_basename = pathinfo($file, PATHINFO_FILENAME); + if ($file_ext === "js") + $dir_path = 'scripts/'; + else if ($file_ext === "css") + $dir_path = 'styles/'; + else + continue; + + $file_url = plugin_dir_url(__DIR__).$dir_path.$file; + $file_path = plugin_dir_path(__DIR__).$dir_path.$file; $file_version = date("ymd-Gis", filemtime($file_path)); - console_log("file_url: " . $file_url); - wp_enqueue_script( $file, $file_url, $previous_file, $file_version, true); - $previous_file = $file; + + if ($file_ext === "js") { + wp_enqueue_script( $file_basename, $file_url, $previous_js_basename, $file_version, true); + $previous_js_basename = $file_basename; + } + else if ($file_ext === "css") { + wp_enqueue_style( $file, $file_url, $previous_css_basename, $file_version, ''); + $previous_css_basename = $file_basename; + } } }