10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- changed class for enqueue tipsy and raty assets;

Browse Source
This commit is contained in:
Mykyta Synelnikov
2023-09-20 19:58:45 +03:00
parent 90de5d0d2c
commit 92be23d00c
9 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-raty.css → assets/libs/raty/um-raty.css
View File
assets/js/um-raty.js → assets/libs/raty/um-raty.js
View File
assets/js/um-raty.min.js → assets/libs/raty/um-raty.min.js
Vendored
View File
assets/css/um-tipsy.css → assets/libs/tipsy/tipsy.css
View File
assets/js/um-tipsy.js → assets/libs/tipsy/tipsy.js
View File
assets/js/um-tipsy.min.js → assets/libs/tipsy/tipsy.min.js
Vendored
View File
includes/admin/class-enqueue.php
+5 -5
View File
@@ -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' );
includes/common/class-enqueue.php
+10 -6
View File
@@ -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 );
includes/frontend/class-enqueue.php
+18 -16
View File
@@ -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