From 92be23d00c38e78e9a0b0ad19ce0575739e5c90e Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 20 Sep 2023 19:58:45 +0300 Subject: [PATCH] - changed class for enqueue tipsy and raty assets; --- assets/{css => libs/raty}/um-raty.css | 0 assets/{js => libs/raty}/um-raty.js | 0 assets/{js => libs/raty}/um-raty.min.js | 0 .../um-tipsy.css => libs/tipsy/tipsy.css} | 0 .../{js/um-tipsy.js => libs/tipsy/tipsy.js} | 0 .../tipsy/tipsy.min.js} | 0 includes/admin/class-enqueue.php | 10 +++--- includes/common/class-enqueue.php | 16 +++++---- includes/frontend/class-enqueue.php | 34 ++++++++++--------- 9 files changed, 33 insertions(+), 27 deletions(-) rename assets/{css => libs/raty}/um-raty.css (100%) rename assets/{js => libs/raty}/um-raty.js (100%) rename assets/{js => libs/raty}/um-raty.min.js (100%) rename assets/{css/um-tipsy.css => libs/tipsy/tipsy.css} (100%) rename assets/{js/um-tipsy.js => libs/tipsy/tipsy.js} (100%) rename assets/{js/um-tipsy.min.js => libs/tipsy/tipsy.min.js} (100%) diff --git a/assets/css/um-raty.css b/assets/libs/raty/um-raty.css similarity index 100% rename from assets/css/um-raty.css rename to assets/libs/raty/um-raty.css diff --git a/assets/js/um-raty.js b/assets/libs/raty/um-raty.js similarity index 100% rename from assets/js/um-raty.js rename to assets/libs/raty/um-raty.js diff --git a/assets/js/um-raty.min.js b/assets/libs/raty/um-raty.min.js similarity index 100% rename from assets/js/um-raty.min.js rename to assets/libs/raty/um-raty.min.js diff --git a/assets/css/um-tipsy.css b/assets/libs/tipsy/tipsy.css similarity index 100% rename from assets/css/um-tipsy.css rename to assets/libs/tipsy/tipsy.css diff --git a/assets/js/um-tipsy.js b/assets/libs/tipsy/tipsy.js similarity index 100% rename from assets/js/um-tipsy.js rename to assets/libs/tipsy/tipsy.js diff --git a/assets/js/um-tipsy.min.js b/assets/libs/tipsy/tipsy.min.js similarity index 100% rename from assets/js/um-tipsy.min.js rename to assets/libs/tipsy/tipsy.min.js diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php index 5ca8c902..da02809e 100644 --- a/includes/admin/class-enqueue.php +++ b/includes/admin/class-enqueue.php @@ -236,7 +236,7 @@ final class Enqueue extends \um\common\Enqueue { wp_register_script( 'um_jquery_form', $this->front_js_baseurl . 'um-jquery-form' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); wp_register_script( 'um_fileupload', $this->front_js_baseurl . 'um-fileupload.js', array( 'jquery' ), UM_VERSION, true ); wp_register_script( 'um_crop', $this->front_js_baseurl . 'um-crop' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); - wp_register_script( 'um_tipsy', $this->front_js_baseurl . 'um-tipsy' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); + //wp_register_script( 'um_tipsy', $this->front_js_baseurl . 'um-tipsy' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); wp_register_script( 'um_functions', $this->front_js_baseurl . 'um-functions' . $suffix . '.js', array( 'jquery', 'um_tipsy', 'um_scrollbar' ), UM_VERSION, true ); wp_register_script( 'um_datetime', $this->front_js_baseurl . 'pickadate/picker.js', array( 'jquery' ), UM_VERSION, true ); @@ -264,7 +264,7 @@ final class Enqueue extends \um\common\Enqueue { wp_register_style( 'um_scrollbar', $this->front_css_baseurl . 'simplebar.css', array(), ultimatemember_version ); wp_register_style( 'um_crop', $this->front_css_baseurl . 'um-crop.css', array(), ultimatemember_version ); - wp_register_style( 'um_tipsy', $this->front_css_baseurl . 'um-tipsy.css', array(), ultimatemember_version ); + //wp_register_style( 'um_tipsy', $this->front_css_baseurl . 'um-tipsy.css', array(), ultimatemember_version ); wp_register_style( 'um_responsive', $this->front_css_baseurl . 'um-responsive.css', array(), ultimatemember_version ); wp_register_style( 'um_modal', $this->front_css_baseurl . 'um-modal.css', array(), ultimatemember_version ); wp_register_style( 'um_styles', $this->front_css_baseurl . 'um-styles.css', array(), ultimatemember_version ); @@ -685,12 +685,12 @@ final class Enqueue extends \um\common\Enqueue { //scripts for frontend preview UM()->frontend()->enqueue()->load_imagecrop(); UM()->frontend()->enqueue()->load_css(); - UM()->frontend()->enqueue()->load_tipsy(); + // UM()->frontend()->enqueue()->load_tipsy(); UM()->frontend()->enqueue()->load_modal(); UM()->frontend()->enqueue()->load_responsive(); - wp_register_script( 'um_raty', UM_URL . 'assets/js/um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true ); - wp_register_style( 'um_raty', UM_URL . 'assets/css/um-raty.css', array(), ultimatemember_version ); + //wp_register_script( 'um_raty', UM_URL . 'assets/js/um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true ); + //wp_register_style( 'um_raty', UM_URL . 'assets/css/um-raty.css', array(), ultimatemember_version ); wp_register_style( 'um_default_css', UM_URL . 'assets/css/um-old-default.css', '', ultimatemember_version, 'all' ); wp_enqueue_style( 'um_default_css' ); diff --git a/includes/common/class-enqueue.php b/includes/common/class-enqueue.php index fdf2ff95..a429415f 100644 --- a/includes/common/class-enqueue.php +++ b/includes/common/class-enqueue.php @@ -71,9 +71,15 @@ class Enqueue { public function common_libs() { $this->register_jquery_ui(); -// wp_register_script( 'um-tipsy', $this->urls['libs'] . 'tipsy/um-tipsy' . $this->suffix . '.js', array( 'jquery' ), '1.0.0a', true ); -// wp_register_style( 'um-tipsy', $this->urls['libs'] . 'tipsy/um-tipsy' . $this->suffix . '.css', array(), '1.0.0a' ); -// + $suffix = self::get_suffix(); + + wp_register_script( 'um_tipsy', self::get_url( 'libs' ) . 'tipsy/tipsy' . $suffix . '.js', array( 'jquery' ), '1.0.0a', true ); + wp_register_style( 'um_tipsy', self::get_url( 'libs' ) . 'tipsy/tipsy' . $suffix . '.css', array(), '1.0.0a' ); + + // Raty JS for rating field-type + wp_register_script( 'um_raty', self::get_url( 'libs' ) . 'raty/um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), '2.6.0', true ); + wp_register_style( 'um_raty', self::get_url( 'libs' ) . 'raty/um-raty' . $suffix . '.css', array(), '2.6.0' ); + // wp_register_script( 'um-helptip', $this->urls['libs'] . 'helptip/helptip' . $this->suffix . '.js', array( 'jquery', 'jquery-ui-tooltip' ), '1.0.0', true ); // wp_register_style( 'um-helptip', $this->urls['libs'] . 'helptip/helptip' . $this->suffix . '.css', array( 'dashicons', 'um_ui' ), '1.0.0' ); // @@ -93,9 +99,7 @@ class Enqueue { // wp_register_script( 'select2', $this->urls['libs'] . 'select2/select2.full' . $this->suffix . '.js', array( 'jquery' ), '4.0.13', true ); // wp_register_style( 'select2', $this->urls['libs'] . 'select2/select2' . $this->suffix . '.css', array(), '4.0.13' ); // -// // Raty JS for rating field-type -// wp_register_script( 'um-raty', $this->urls['libs'] . 'raty/um-raty' . $this->suffix . '.js', array( 'jquery', 'wp-i18n' ), '2.6.0', true ); -// wp_register_style( 'um-raty', $this->urls['libs'] . 'raty/um-raty' . $this->suffix . '.css', array(), '2.6.0' ); + // // // Modal // wp_register_script( 'um-modal', $this->urls['libs'] . 'modal/um-modal' . $this->suffix . '.js', array( 'jquery', 'wp-i18n', 'wp-hooks' ), UM_VERSION, true ); diff --git a/includes/frontend/class-enqueue.php b/includes/frontend/class-enqueue.php index 5c2f6b00..0384c31e 100644 --- a/includes/frontend/class-enqueue.php +++ b/includes/frontend/class-enqueue.php @@ -107,8 +107,8 @@ final class Enqueue extends \um\common\Enqueue { } } - wp_register_script( 'um_tipsy', $this->js_baseurl . 'um-tipsy' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); - wp_register_script( 'um_raty', $this->js_baseurl . 'um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), UM_VERSION, true ); + //wp_register_script( 'um_tipsy', $this->js_baseurl . 'um-tipsy' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); + // wp_register_script( 'um_raty', $this->js_baseurl . 'um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), UM_VERSION, true ); wp_register_script( 'um_crop', $this->js_baseurl . 'um-crop' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true ); wp_register_script( 'um_modal', $this->js_baseurl . 'um-modal' . $suffix . '.js', array( 'jquery', 'wp-util', 'um_crop' ), UM_VERSION, true ); @@ -173,8 +173,8 @@ final class Enqueue extends \um\common\Enqueue { wp_register_style( 'um_fonticons_ii', $this->css_baseurl . 'um-fonticons-ii.css', array(), UM_VERSION ); wp_register_style( 'um_fonticons_fa', $this->css_baseurl . 'um-fonticons-fa.css', array(), UM_VERSION ); wp_register_style( 'um_crop', $this->css_baseurl . 'um-crop.css', array(), UM_VERSION ); - wp_register_style( 'um_tipsy', $this->css_baseurl . 'um-tipsy.css', array(), UM_VERSION ); - wp_register_style( 'um_raty', $this->css_baseurl . 'um-raty.css', array(), UM_VERSION ); + //wp_register_style( 'um_tipsy', $this->css_baseurl . 'um-tipsy.css', array(), UM_VERSION ); + //wp_register_style( 'um_raty', $this->css_baseurl . 'um-raty.css', array(), UM_VERSION ); wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), '4.0.13' ); wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), UM_VERSION ); wp_register_style( 'um_datetime', $this->css_baseurl . 'pickadate/default.css', array(), UM_VERSION ); @@ -261,7 +261,7 @@ final class Enqueue extends \um\common\Enqueue { $this->load_datetimepicker(); - $this->load_raty(); + //$this->load_raty(); //$this->load_scrollto(); @@ -269,7 +269,7 @@ final class Enqueue extends \um\common\Enqueue { $this->load_imagecrop(); - $this->load_tipsy(); + //$this->load_tipsy(); $this->load_functions(); @@ -381,16 +381,6 @@ final class Enqueue extends \um\common\Enqueue { wp_enqueue_style('um_scrollbar'); } - - /** - * Load rating - */ - function load_raty() { - wp_enqueue_script('um_raty'); - wp_enqueue_style('um_raty'); - } - - /** * Load crop script */ @@ -402,12 +392,24 @@ final class Enqueue extends \um\common\Enqueue { /** * Load tipsy + * + * @depecated 2.6.12 */ function load_tipsy() { wp_enqueue_script( 'um_tipsy' ); wp_enqueue_style( 'um_tipsy' ); } + /** + * Load rating + * + * @depecated 2.6.12 + */ + function load_raty() { + wp_enqueue_script('um_raty'); + wp_enqueue_style('um_raty'); + } + /** * Load modal