From 7157c669e5f7afdbf1d42a039045840e9114f7e0 Mon Sep 17 00:00:00 2001 From: Sergey Krylov Date: Sun, 28 Mar 2021 15:22:12 +0300 Subject: [PATCH] little fixes --- footer.php | 2 +- parts/landings/graduation/callback.php | 2 +- php/wordpress/constants.php | 2 +- php/wordpress/scripts.php | 37 +++++++++++++------------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/footer.php b/footer.php index 227766f..0a37541 100644 --- a/footer.php +++ b/footer.php @@ -45,7 +45,7 @@
- 2020 ArmantyQuests + 2021 ArmantyQuests
diff --git a/parts/landings/graduation/callback.php b/parts/landings/graduation/callback.php index 9dcdf9b..ae38123 100644 --- a/parts/landings/graduation/callback.php +++ b/parts/landings/graduation/callback.php @@ -16,7 +16,7 @@
- © Copyright. Все права защищены + 2021 ArmantyQuests
\ No newline at end of file diff --git a/php/wordpress/constants.php b/php/wordpress/constants.php index c74e9f5..fc785c4 100644 --- a/php/wordpress/constants.php +++ b/php/wordpress/constants.php @@ -13,6 +13,6 @@ 'img' => get_template_directory_uri() . '/assets/img', ]; - $version = '1.0.5'; + $version = '1.0.6'; } ?> \ No newline at end of file diff --git a/php/wordpress/scripts.php b/php/wordpress/scripts.php index e245534..78da3e4 100644 --- a/php/wordpress/scripts.php +++ b/php/wordpress/scripts.php @@ -4,50 +4,51 @@ function armanty_get_scripts(){ $js = $GLOBALS['paths']['js']; $libs = $GLOBALS['paths']['libs']; + $version = $GLOBALS['version']; wp_deregister_script( 'jquery' ); wp_register_script( 'jquery', $libs . '/jquery-3.4.1/jquery-3.4.1.min.js'); wp_enqueue_script('jquery'); - wp_enqueue_script( 'jqmask', $libs . '/jQuery-Mask-Plugin-master/dist/jquery.mask.min.js', ['jquery'], null, true); + wp_enqueue_script( 'jqmask', $libs . '/jQuery-Mask-Plugin-master/dist/jquery.mask.min.js', ['jquery'], $version, true); - wp_enqueue_script( 'bootstrap', $libs . '/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js', ['jquery'], null, true); + wp_enqueue_script( 'bootstrap', $libs . '/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js', ['jquery'], $version, true); if (!is_page_template('templates/graduation.php')) { - wp_enqueue_script( 'poper', $libs . '/bootstrap-4.4.1-dist/js/popper.min.js', ['jquery'], null, true); - wp_enqueue_script( 'owlcarousel', $libs . '/OwlCarousel2-2.3.4/dist/owl.carousel.js', ['jquery'], null, true); - wp_enqueue_script( 'moment', $libs . '/bootstrap_datetimepicker/js/moment-with-locales.min.js', ['jquery'], null, true); - wp_enqueue_script( 'bootstrap', $libs . '/bootstrap_datetimepicker/js/bootstrap.min.js', ['jquery', 'moment'], null, true); - wp_enqueue_script( 'dtpicker', $libs . '/bootstrap_datetimepicker/js/bootstrap-datetimepicker.min.js', ['jquery', 'moment'], null, true); + wp_enqueue_script( 'poper', $libs . '/bootstrap-4.4.1-dist/js/popper.min.js', ['jquery'], $version, true); + wp_enqueue_script( 'owlcarousel', $libs . '/OwlCarousel2-2.3.4/dist/owl.carousel.js', ['jquery'], $version, true); + wp_enqueue_script( 'moment', $libs . '/bootstrap_datetimepicker/js/moment-with-locales.min.js', ['jquery'], $version, true); + wp_enqueue_script( 'bootstrap', $libs . '/bootstrap_datetimepicker/js/bootstrap.min.js', ['jquery', 'moment'], $version, true); + wp_enqueue_script( 'dtpicker', $libs . '/bootstrap_datetimepicker/js/bootstrap-datetimepicker.min.js', ['jquery', 'moment'], $version, true); wp_enqueue_script( 'select', $libs . '/bootstrap-select/bootstrap-select.min.js'); - wp_enqueue_script( 'script', $js . '/script.js', ['jquery'], null, true); - wp_enqueue_script( 'slider', $libs . '/jQuery-Waterwheel-Carousel/js/jquery.waterwheelCarousel.min.js', ['jquery'], null, true); - wp_enqueue_script( 'swiper', $libs . '/jQueryTouchSwipe/jquery.touchSwipe.min.js', ['jquery'], null, true); - wp_enqueue_script( 'slick', 'https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick.min.js', ['jquery'], null, true); + wp_enqueue_script( 'script', $js . '/script.js', ['jquery'], $version, true); + wp_enqueue_script( 'slider', $libs . '/jQuery-Waterwheel-Carousel/js/jquery.waterwheelCarousel.min.js', ['jquery'], $version, true); + wp_enqueue_script( 'swiper', $libs . '/jQueryTouchSwipe/jquery.touchSwipe.min.js', ['jquery'], $version, true); + wp_enqueue_script( 'slick', 'https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.9.0/slick.min.js', ['jquery'], $version, true); if(is_front_page() || is_page ('24') || is_page('35') || is_page('56')){ - wp_enqueue_script( 'main', $js . '/components/main.js', ['jquery'], null, true); + wp_enqueue_script( 'main', $js . '/components/main.js', ['jquery'], $version, true); } if(is_page ('8')){ - wp_enqueue_script( 'quests', $js . '/components/quests.js', ['jquery'], null, true); + wp_enqueue_script( 'quests', $js . '/components/quests.js', ['jquery'], $version, true); } if(is_page ('24')){ - wp_enqueue_script( 'quests', $js . '/components/holiday.js', ['jquery'], null, true); + wp_enqueue_script( 'quests', $js . '/components/holiday.js', ['jquery'], $version, true); } if(is_page ('35')){ - wp_enqueue_script( 'certificates', $js . '/components/certificates.js', ['jquery'], null, true); + wp_enqueue_script( 'certificates', $js . '/components/certificates.js', ['jquery'], $version, true); } if(is_page ('56')){ - wp_enqueue_script( 'sales', $js . '/components/sales.js', ['jquery'], null, true); + wp_enqueue_script( 'sales', $js . '/components/sales.js', ['jquery'], $version, true); } if(is_page ('59')){ - wp_enqueue_script( 'form', $js . '/components/form.js', ['jquery'], null, true); + wp_enqueue_script( 'form', $js . '/components/form.js', ['jquery'], $version, true); } } if (is_page_template('templates/graduation.php')) { - wp_enqueue_script( 'graduation', $js . '/components/graduation.js'); + wp_enqueue_script( 'graduation', $js . '/components/graduation.js', ['jquery'], $version, true); } }; ?> \ No newline at end of file