10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

- FontIcons libraries moving to legacy;

Browse Source 
- changed FontIcons libraries enqueue place (moved to common);
This commit is contained in:
Mykyta Synelnikov
2023-09-26 12:25:49 +03:00
parent 84dc5e9b2b
commit bd2cc5a69d
14 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/font/fontawesome-webfont.eot → assets/libs/legacy/fonticons/font/fontawesome-webfont.eot
View File
assets/font/fontawesome-webfont.svg → assets/libs/legacy/fonticons/font/fontawesome-webfont.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 434 KiB

assets/font/fontawesome-webfont.ttf → assets/libs/legacy/fonticons/font/fontawesome-webfont.ttf
View File
assets/font/fontawesome-webfont.woff → assets/libs/legacy/fonticons/font/fontawesome-webfont.woff
View File
assets/font/ionicons.eot → assets/libs/legacy/fonticons/font/ionicons.eot
View File
assets/font/ionicons.svg → assets/libs/legacy/fonticons/font/ionicons.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 KiB

After

Width:  |  Height:  |  Size: 326 KiB

assets/font/ionicons.ttf → assets/libs/legacy/fonticons/font/ionicons.ttf
View File
assets/font/ionicons.woff → assets/libs/legacy/fonticons/font/ionicons.woff
View File
assets/css/um-fonticons-fa.css → assets/libs/legacy/fonticons/fonticons-fa.css
+5 -5
View File
@@ -2,11 +2,11 @@
@font-face {
font-family: "FontAwesome";
src:url("../font/fontawesome-webfont.eot?v=4.2.0");
src:url("../font/fontawesome-webfont.eot?v=4.2.0#iefix") format("embedded-opentype"),
url("../font/fontawesome-webfont.woff?v=4.2.0") format("woff"),
url("../font/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),
url("../font/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");
src:url("font/fontawesome-webfont.eot?v=4.2.0");
src:url("font/fontawesome-webfont.eot?v=4.2.0#iefix") format("embedded-opentype"),
url("font/fontawesome-webfont.woff?v=4.2.0") format("woff"),
url("font/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),
url("font/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");
font-display: swap;
font-weight: normal;
font-style: normal;
assets/css/um-fonticons-ii.css → assets/libs/legacy/fonticons/fonticons-ii.css
+6 -6
View File
@@ -2,11 +2,11 @@
@font-face {
font-family: "Ionicons";
src:url("../font/ionicons.eot?v=2.0.0");
src:url("../font/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"),
url("../font/ionicons.woff?v=2.0.0") format("woff"),
url("../font/ionicons.ttf?v=2.0.0") format("truetype"),
url("../font/ionicons.svg?v=2.0.0#Ionicons") format("svg");
src:url("font/ionicons.eot?v=2.0.0");
src:url("font/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"),
url("font/ionicons.woff?v=2.0.0") format("woff"),
url("font/ionicons.ttf?v=2.0.0") format("truetype"),
url("font/ionicons.svg?v=2.0.0#Ionicons") format("svg");
font-display: swap;
font-weight: normal;
font-style: normal;
@@ -1489,4 +1489,4 @@
.um-icon-wrench:before { content: "\f2ba"; }
.um-icon-xbox:before { content: "\f30c"; }
.um-icon-xbox:before { content: "\f30c"; }
includes/admin/class-enqueue.php
+14 -14
View File
@@ -95,15 +95,15 @@ final class Enqueue extends \um\common\Enqueue {
if ( is_rtl() ) {
wp_register_style( 'um_members_rtl', UM_URL . 'assets/css/um-members-rtl.css', array( 'um_members' ), UM_VERSION );
}
wp_register_style( 'um_styles', UM_URL . 'assets/css/um-styles.css', array(), UM_VERSION );
wp_register_style( 'um_styles', UM_URL . 'assets/css/um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa' ), UM_VERSION );
wp_register_style( 'um_profile', UM_URL . 'assets/css/um-profile.css', array(), UM_VERSION );
wp_register_style( 'um_crop', UM_URL . 'assets/css/um-crop.css', array(), UM_VERSION );
wp_register_style( 'um_responsive', UM_URL . 'assets/css/um-responsive.css', array( 'um_profile', 'um_crop' ), UM_VERSION );
wp_register_style( 'um_account', UM_URL . 'assets/css/um-account.css', array(), UM_VERSION );
wp_register_style( 'um_default_css', UM_URL . 'assets/css/um-old-default.css', array(), UM_VERSION );
wp_register_style( 'um_fonticons_fa', UM_URL . 'assets/css/um-fonticons-fa.css', array(), UM_VERSION );
//wp_register_style( 'um_fonticons_fa', UM_URL . 'assets/css/um-fonticons-fa.css', array(), UM_VERSION );
wp_register_style( 'select2', UM_URL . 'assets/css/select2/select2' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_fonticons_ii', UM_URL . 'assets/css/um-fonticons-ii.css', array(), UM_VERSION );
//wp_register_style( 'um_fonticons_ii', UM_URL . 'assets/css/um-fonticons-ii.css', array(), UM_VERSION );
wp_register_script( 'um_admin_blocks_shortcodes', UM_URL . 'assets/js/um-blocks' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), UM_VERSION, true );
wp_set_script_translations( 'um_admin_blocks_shortcodes', 'ultimate-member' );
@@ -183,10 +183,10 @@ final class Enqueue extends \um\common\Enqueue {
wp_enqueue_script( 'um_functions' );
wp_enqueue_script( 'um_responsive' );
wp_enqueue_style( 'um_fonticons_ii' );
//wp_enqueue_style( 'um_fonticons_ii' );
wp_enqueue_style( 'select2' );
wp_enqueue_style( 'um_default_css' );
wp_enqueue_style( 'um_fonticons_fa' );
// wp_enqueue_style( 'um_fonticons_fa' );
wp_enqueue_style( 'um_members' );
wp_enqueue_style( 'um_styles' );
wp_enqueue_style( 'um_profile' );
@@ -236,7 +236,6 @@ 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_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,10 +263,9 @@ 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_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 );
wp_register_style( 'um_styles', $this->front_css_baseurl . 'um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa' ), ultimatemember_version );
wp_register_style( 'um_members', $this->front_css_baseurl . 'um-members.css', array(), ultimatemember_version );
wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), ultimatemember_version );
wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), ultimatemember_version );
@@ -487,13 +485,15 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load Fonticons
*
* @depecated 2.6.12
*/
public function load_fonticons() {
wp_register_style( 'um_fonticons_ii', UM_URL . 'assets/css/um-fonticons-ii.css', array(), ultimatemember_version );
wp_enqueue_style( 'um_fonticons_ii' );
wp_register_style( 'um_fonticons_fa', UM_URL . 'assets/css/um-fonticons-fa.css', array(), ultimatemember_version );
wp_enqueue_style( 'um_fonticons_fa' );
// wp_register_style( 'um_fonticons_ii', UM_URL . 'assets/css/um-fonticons-ii.css', array(), ultimatemember_version );
// wp_enqueue_style( 'um_fonticons_ii' );
//
// wp_register_style( 'um_fonticons_fa', UM_URL . 'assets/css/um-fonticons-fa.css', array(), ultimatemember_version );
// wp_enqueue_style( 'um_fonticons_fa' );
}
@@ -679,7 +679,7 @@ final class Enqueue extends \um\common\Enqueue {
$this->load_css();
$this->load_core_wp();
$this->load_ajax_js();
$this->load_fonticons();
//$this->load_fonticons();
$this->load_localize_scripts();
//scripts for frontend preview
includes/common/class-enqueue.php
+7 -6
View File
@@ -37,6 +37,7 @@ class Enqueue {
public function __construct() {
add_action( 'admin_enqueue_scripts', array( &$this, 'common_libs' ), 9 );
add_action( 'wp_enqueue_scripts', array( &$this, 'common_libs' ), 9 );
add_action( 'enqueue_block_assets', array( &$this, 'common_libs' ), 9 );
}
public static function get_url( $type ) {
@@ -76,17 +77,17 @@ class Enqueue {
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
// 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' );
// Legacy FontIcons.
wp_register_style( 'um_fonticons_ii', self::get_url( 'libs' ) . 'legacy/fonticons/fonticons-ii' . $suffix . '.css', array(), UM_VERSION ); // Ionicons
wp_register_style( 'um_fonticons_fa', self::get_url( 'libs' ) . 'legacy/fonticons/fonticons-fa' . $suffix . '.css', array(), UM_VERSION ); // FontAwesome
// 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' );
//
// // Legacy Fonticons
// wp_register_style( 'um-fonticons-ii', $this->urls['libs'] . 'fonticons/um-fonticons-ii' . $this->suffix . '.css', array(), UM_VERSION );
// wp_register_style( 'um-fonticons-fa', $this->urls['libs'] . 'fonticons/um-fonticons-fa' . $this->suffix . '.css', array(), UM_VERSION );
//
// // Select2
// $dequeue_select2 = apply_filters( 'um_dequeue_select2_scripts', false );
// if ( class_exists( 'WooCommerce' ) || $dequeue_select2 ) {
includes/core/class-fonticons.php
+2 -2
View File
@@ -27,8 +27,8 @@ if ( ! class_exists( 'um\core\FontIcons' ) ) {
$cached_option = get_option( 'um_cache_fonticons', array() );
if ( empty( $cached_option ) ) {
$files['ii'] = UM_PATH . 'assets/css/um-fonticons-ii.css';
$files['fa'] = UM_PATH . 'assets/css/um-fonticons-fa.css';
$files['ii'] = UM_PATH . 'assets/libs/legacy/fonticons/fonticons-ii.css';
$files['fa'] = UM_PATH . 'assets/libs/legacy/fonticons/fonticons-fa.css';
$array = array();
foreach ( $files as $c => $file ) {
includes/frontend/class-enqueue.php
+12 -12
View File
@@ -118,7 +118,7 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_script( 'um-gdpr', $this->js_baseurl . 'um-gdpr' . $suffix . '.js', array( 'jquery' ), UM_VERSION, false );
wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', /*'um_datetime_legacy',*/ 'select2' ), UM_VERSION, true );
wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', /*'um_datetime_legacy',*/ 'select2', 'um_tipsy', 'um_raty' ), UM_VERSION, true );
/**
* UM hook
*
@@ -167,11 +167,10 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Register styles
*/
function register_styles() {
public function register_styles() {
//FontAwesome and FontIcons styles
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_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 );
@@ -187,17 +186,16 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_style( 'um_modal', $this->css_baseurl . 'um-modal.css', array( 'um_crop' ), UM_VERSION );
wp_register_style( 'um_responsive', $this->css_baseurl . 'um-responsive.css', array( 'um_profile', 'um_crop' ), UM_VERSION );
wp_register_style( 'um_styles', $this->css_baseurl . 'um-styles.css', array(), UM_VERSION );
wp_register_style( 'um_styles', $this->css_baseurl . 'um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa' ), UM_VERSION );
wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array( 'um_ui' ), UM_VERSION );
wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array( 'um_styles' ), UM_VERSION );
if ( is_rtl() ) {
wp_register_style( 'um_members_rtl', $this->css_baseurl . 'um-members-rtl.css', array( 'um_members' ), UM_VERSION );
}
wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array(), UM_VERSION );
wp_register_style( 'um_account', $this->css_baseurl . 'um-account.css', array(), UM_VERSION );
wp_register_style( 'um_misc', $this->css_baseurl . 'um-misc.css', array(), UM_VERSION );
wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array( 'um_styles' ), UM_VERSION );
wp_register_style( 'um_account', $this->css_baseurl . 'um-account.css', array( 'um_styles' ), UM_VERSION );
wp_register_style( 'um_misc', $this->css_baseurl . 'um-misc.css', array( 'um_styles' ), UM_VERSION );
}
@@ -249,7 +247,7 @@ final class Enqueue extends \um\common\Enqueue {
//maybe deprecated
//$this->load_google_charts();
$this->load_fonticons();
//$this->load_fonticons();
$this->load_selectjs();
@@ -316,6 +314,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load Fonticons
*
* @depecated 2.6.12
*/
function load_fonticons() {
wp_enqueue_style( 'um_fonticons_ii' );