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

- wp-admin assets refactoring (in process);

Browse Source
This commit is contained in:
Mykyta Synelnikov
2023-11-09 13:47:49 +02:00
parent c65d7169d7
commit ecc4346d1f
22 changed files with 635 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/class-enqueue.php
+18 -26
View File
@@ -57,8 +57,6 @@ final class Enqueue extends \um\common\Enqueue {
public function __construct() {
parent::__construct();
$this->css_url = UM_URL . 'includes/admin/assets/css/';
$this->front_js_baseurl = UM_URL . 'assets/js/';
$this->front_css_baseurl = UM_URL . 'assets/css/';
@@ -102,19 +100,9 @@ final class Enqueue extends \um\common\Enqueue {
*/
public function block_editor() {
$suffix = self::get_suffix();
$libs_url = self::get_url( 'libs' );
$js_url = self::get_url( 'js' );
wp_register_style( 'um_members', UM_URL . 'assets/css/um-members.css', array( 'um_ui' ), UM_VERSION );
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_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION );
wp_register_style( 'um_profile', UM_URL . 'assets/css/um-profile.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_script( 'um_admin_blocks_shortcodes', UM_URL . 'assets/js/um-blocks' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), UM_VERSION, true );
wp_register_script( 'um_admin_blocks_shortcodes', $js_url . 'admin/block-renderer' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), UM_VERSION, true );
wp_set_script_translations( 'um_admin_blocks_shortcodes', 'ultimate-member' );
if ( ! empty( UM()->account()->get_tab_fields( 'notifications', array() ) ) ) {
@@ -150,11 +138,8 @@ final class Enqueue extends \um\common\Enqueue {
wp_enqueue_script( 'um_admin_blocks_shortcodes' );
wp_register_script( 'um_datetime', UM_URL . 'assets/js/pickadate/picker.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_datetime_date', UM_URL . 'assets/js/pickadate/picker.date.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
wp_register_script( 'um_datetime_time', UM_URL . 'assets/js/pickadate/picker.time.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
wp_register_script( 'um_conditional', UM_URL . 'assets/js/um-conditional' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script( 'um_scripts', UM_URL . 'assets/js/um-scripts' . $suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', self::$select2_handle ), UM_VERSION, true );
wp_register_script( 'um_scripts', UM_URL . 'assets/js/um-scripts' . $suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_common', self::$select2_handle ), UM_VERSION, true );
$max_upload_size = wp_max_upload_size();
if ( ! $max_upload_size ) {
$max_upload_size = 0;
@@ -178,9 +163,6 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_script( 'um_responsive', UM_URL . 'assets/js/um-responsive' . $suffix . '.js', array( 'jquery', 'um_functions', 'um_crop' ), UM_VERSION, true );
// render blocks
wp_enqueue_script( 'um_datetime' );
wp_enqueue_script( 'um_datetime_date' );
wp_enqueue_script( 'um_datetime_time' );
wp_enqueue_script( 'um_conditional' );
wp_enqueue_script( 'um_dropdown' );
wp_enqueue_script( 'um_members' );
@@ -188,6 +170,16 @@ final class Enqueue extends \um\common\Enqueue {
wp_enqueue_script( 'um_functions' );
wp_enqueue_script( 'um_responsive' );
wp_register_style( 'um_members', UM_URL . 'assets/css/um-members.css', array( 'um_ui' ), UM_VERSION );
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_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION );
wp_register_style( 'um_profile', UM_URL . 'assets/css/um-profile.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_enqueue_style( 'um_default_css' );
wp_enqueue_style( 'um_members' );
wp_enqueue_style( 'um_styles' );
@@ -195,7 +187,7 @@ final class Enqueue extends \um\common\Enqueue {
wp_enqueue_style( 'um_responsive' );
wp_enqueue_style( 'um_account' );
$custom_css = '.um{opacity: 1;}.um_request_name {display: none !important;}';
$custom_css = '.wp-block .um{opacity: 1;}.um_request_name {display: none !important;}';
wp_add_inline_style( 'um_styles', $custom_css );
@@ -420,8 +412,8 @@ final class Enqueue extends \um\common\Enqueue {
$js_url = self::get_url( 'js' );
$css_url = self::get_url( 'css' );
wp_register_script( 'um_block_js', $js_url . 'admin/block' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components', 'wp-hooks' ), UM_VERSION, true );
wp_set_script_translations( 'um_block_js', 'ultimate-member' );
wp_register_script( 'um_block_restrictions', $js_url . 'admin/block-restrictions' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components', 'wp-hooks' ), UM_VERSION, true );
wp_set_script_translations( 'um_block_restrictions', 'ultimate-member' );
$restrict_options = array();
$roles = UM()->roles()->get_roles();
@@ -433,8 +425,8 @@ final class Enqueue extends \um\common\Enqueue {
);
}
}
wp_localize_script( 'um_block_js', 'um_restrict_roles', $restrict_options );
wp_enqueue_script( 'um_block_js' );
wp_localize_script( 'um_block_restrictions', 'um_restrict_roles', $restrict_options );
wp_enqueue_script( 'um_block_restrictions' );
wp_register_style( 'um_block_css', $css_url . 'admin/block' . $suffix . '.css', array(), UM_VERSION );
wp_enqueue_style( 'um_block_css' );
includes/admin/class-screen.php
+3 -3
View File
@@ -27,11 +27,11 @@ class Screen {
$is_um_screen = false;
if ( ! empty( $current_screen ) && isset( $current_screen->id ) ) {
$screen_id = $current_screen->id;
if ( strstr( $screen_id, 'ultimatemember' ) ||
if ( 'nav-menus' === $screen_id ||
strstr( $screen_id, 'ultimatemember' ) ||
strstr( $screen_id, 'um_' ) ||
strstr( $screen_id, 'user' ) ||
strstr( $screen_id, 'profile' ) ||
'nav-menus' === $screen_id ) {
strstr( $screen_id, 'profile' ) ) {
$is_um_screen = true;
}
}
includes/common/class-enqueue.php
+74 -2
View File
@@ -71,6 +71,73 @@ class Enqueue {
wp_register_style( 'um_ui', self::get_url( 'libs' ) . 'jquery-ui/jquery-ui' . self::get_suffix() . '.css', array(), '1.13.2' );
}
private function get_pickadate_locale() {
$suffix = self::get_suffix();
$locale = get_locale();
if ( file_exists( WP_LANG_DIR . '/plugins/ultimate-member/assets/js/pickadate/' . $locale . $suffix . '.js' ) || file_exists( UM_PATH . 'assets/libs/pickadate/translations/' . $locale . $suffix . '.js' ) ) {
return $locale;
}
if ( false !== strpos( $locale, 'es_' ) ) {
$locale = 'es_ES';
} elseif ( false !== strpos( $locale, 'de_' ) ) {
$locale = 'de_DE';
} else {
switch ( $locale ) {
case 'uk':
$locale = 'uk_UA';
break;
case 'ja':
$locale = 'ja_JP';
break;
case 'ka_GE':
$locale = 'ge_GEO';
break;
case 'ary':
$locale = 'ar';
break;
case 'ca':
$locale = 'ca_ES';
break;
case 'el':
$locale = 'el_GR';
break;
case 'et':
$locale = 'et_EE';
break;
case 'eu':
$locale = 'eu_ES';
break;
case 'fa_AF':
$locale = 'fa_IR';
break;
case 'fi':
$locale = 'fi_FI';
break;
case 'hr':
$locale = 'hr_HR';
break;
case 'km':
$locale = 'km_KH';
break;
case 'lv':
$locale = 'lv_LV';
break;
case 'th':
$locale = 'th_TH';
break;
case 'vi':
$locale = 'vi_VN';
break;
case 'sr_SR':
$locale = 'sr_RS_lt';
break;
}
}
return apply_filters( 'um_get_pickadate_locale', $locale, $suffix );
}
/**
* Register common JS/CSS libraries.
*
@@ -130,13 +197,18 @@ class Enqueue {
wp_register_script( 'um_datetime', $libs_url . 'pickadate/picker' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_datetime_date', $libs_url . 'pickadate/picker.date' . $suffix . '.js', array( 'um_datetime' ), UM_VERSION, true );
wp_register_script( 'um_datetime_time', $libs_url . 'pickadate/picker.time' . $suffix . '.js', array( 'um_datetime' ), UM_VERSION, true );
$common_js_deps = array( 'jquery', 'wp-util', 'wp-hooks', 'wp-i18n', 'um_tipsy', 'um_datetime_date', 'um_datetime_time' );
// Load a localized version for date/time.
$locale = get_locale();
$locale = $this->get_pickadate_locale();
if ( $locale ) {
if ( file_exists( WP_LANG_DIR . '/plugins/ultimate-member/assets/js/pickadate/' . $locale . $suffix . '.js' ) ) {
wp_register_script( 'um_datetime_locale', content_url() . '/languages/plugins/ultimate-member/assets/js/pickadate/' . $locale . $suffix . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
$common_js_deps[] = 'um_datetime_locale';
} elseif ( file_exists( UM_PATH . 'assets/libs/pickadate/translations/' . $locale . $suffix . '.js' ) ) {
wp_register_script( 'um_datetime_locale', $libs_url . 'pickadate/translations/' . $locale . $suffix . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
$common_js_deps[] = 'um_datetime_locale';
}
}
@@ -144,7 +216,7 @@ class Enqueue {
wp_register_style( 'um_datetime_date', $libs_url . 'pickadate/default.date' . $suffix . '.css', array( 'um_datetime' ), UM_VERSION );
wp_register_style( 'um_datetime_time', $libs_url . 'pickadate/default.time' . $suffix . '.css', array( 'um_datetime' ), UM_VERSION );
wp_register_script( 'um_common', $js_url . 'common' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-hooks', 'wp-i18n', 'um_tipsy', 'um_datetime_date', 'um_datetime_time' ), UM_VERSION, true );
wp_register_script( 'um_common', $js_url . 'common' . $suffix . '.js', $common_js_deps, UM_VERSION, true );
$um_common_variables = array(
'locale' => get_locale(),
);
includes/frontend/class-enqueue.php
+1 -1
View File
@@ -116,7 +116,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( 'um_frontend_common', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', /*'um_datetime_legacy',*/ self::$select2_handle, 'um_raty' ), UM_VERSION, true );
wp_register_script( 'um_scripts', $this->js_baseurl . 'um-scripts' . $suffix . '.js', array( 'um_frontend_common', 'um_conditional', self::$select2_handle, 'um_raty' ), UM_VERSION, true );
$max_upload_size = wp_max_upload_size();
if ( ! $max_upload_size ) {