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

- minified assets;

Browse Source 
- updated readme.txt > changelog section;
- PHPDoc + Hookdocs updated for enqueue classes (common, admin, frontend);
- fixed typos in PHPDoc;
This commit is contained in:
Mykyta Synelnikov
2023-11-17 17:25:47 +02:00
parent 0bb3e243f6
commit 9798c81a5e
29 changed files with 406 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/class-admin-functions.php
+6 -6
View File
@@ -30,36 +30,36 @@ if ( ! class_exists( 'um\admin\Admin_Functions' ) ) {
/**
* Boolean check if we're viewing UM backend
*
* @deprecated 2.7.1
* @deprecated 2.8.0
*
* @return bool
*/
public function is_um_screen() {
_deprecated_function( __METHOD__, '2.7.1', 'UM()->admin()->screen()->is_own_screen()' );
_deprecated_function( __METHOD__, '2.8.0', 'UM()->admin()->screen()->is_own_screen()' );
return UM()->admin()->screen()->is_own_screen();
}
/**
* Check if current page load UM post type
*
* @deprecated 2.7.1
* @deprecated 2.8.0
*
* @return bool
*/
public function is_plugin_post_type() {
_deprecated_function( __METHOD__, '2.7.1', 'UM()->admin()->screen()->is_own_post_type()' );
_deprecated_function( __METHOD__, '2.8.0', 'UM()->admin()->screen()->is_own_post_type()' );
return UM()->admin()->screen()->is_own_post_type();
}
/**
* If page now show content with restricted post/taxonomy
*
* @deprecated 2.7.1
* @deprecated 2.8.0
*
* @return bool
*/
public function is_restricted_entity() {
_deprecated_function( __METHOD__, '2.7.1', 'UM()->admin()->screen()->is_restricted_entity()' );
_deprecated_function( __METHOD__, '2.8.0', 'UM()->admin()->screen()->is_restricted_entity()' );
return UM()->admin()->screen()->is_restricted_entity();
}
}
includes/admin/class-admin.php
+1 -1
View File
@@ -2049,7 +2049,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
}
/**
* @since 2.7.1
* @since 2.8.0
*
* @return Screen
*/
includes/admin/class-enqueue.php
+126 -53
View File
@@ -12,54 +12,47 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
final class Enqueue extends \um\common\Enqueue {
/**
* @var string
* @deprecated 2.7.1
* @deprecated 2.8.0
*/
public $js_url;
/**
* @var string
* @deprecated 2.8.0
*/
public $css_url;
/**
* @var string
* @deprecated 2.8.0
*/
public $front_js_baseurl;
/**
* @var string
* @deprecated 2.8.0
*/
public $front_css_baseurl;
/**
* @var bool
* @deprecated 2.8.0
*/
public $post_page;
/**
* @var bool
*/
private static $um_cpt_form_screen = false;
/**
* @var bool
* @deprecated 2.7.1
*/
public $post_page;
/**
* Enqueue constructor.
*/
public function __construct() {
parent::__construct();
$this->front_js_baseurl = UM_URL . 'assets/js/';
$this->front_css_baseurl = UM_URL . 'assets/css/';
add_filter( 'admin_body_class', array( &$this, 'admin_body_class' ), 999 );
add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
@@ -82,7 +75,7 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Adds class to our admin pages
*
* @since 2.7.1
* @since 2.8.0
*
* @param $classes
*
@@ -96,7 +89,9 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* Enqueue Gutenberg Block Editor assets
* Enqueue Gutenberg Block Editor assets.
*
* @since 2.6.1
*/
public function block_editor() {
$suffix = self::get_suffix();
@@ -135,33 +130,49 @@ final class Enqueue extends \um\common\Enqueue {
'enabled' => UM()->options()->get( 'account_tab_delete' ),
),
);
/**
* Filters data array for localize wp-admin Gutenberg scripts for account block.
*
* @since 2.6.1
* @hook um_extend_account_settings
*
* @param {array} $um_account_settings Data to localize.
*
* @return {array} Data to localize.
*
* @example <caption>Add `my_custom_variable` to wp-admin blocks shortcodes scripts to be callable via `um_account_settings.my_custom_variable` in JS.</caption>
* function um_custom_extend_account_settings( $um_account_settings ) {
* return $um_account_settings;
* }
* add_filter( 'um_extend_account_settings', 'um_custom_extend_account_settings' );
*/
$um_account_settings = apply_filters( 'um_extend_account_settings', $um_account_settings );
wp_localize_script( 'um_admin_blocks_shortcodes', 'um_account_settings', $um_account_settings );
wp_enqueue_script( 'um_admin_blocks_shortcodes' );
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_common', self::$select2_handle ), UM_VERSION, true );
wp_register_script( 'um_conditional', $js_url . 'um-conditional' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script( 'um_scripts', $js_url . '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;
}
$localize_data = apply_filters(
'um_enqueue_localize_data',
array(
'max_upload_size' => $max_upload_size,
'nonce' => wp_create_nonce( 'um-frontend-nonce' ),
)
$localize_data = array(
'max_upload_size' => $max_upload_size,
'nonce' => wp_create_nonce( 'um-frontend-nonce' ),
);
/** This filter is documented in includes/frontend/class-enqueue.php */
$localize_data = apply_filters( 'um_enqueue_localize_data', $localize_data );
wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
wp_register_script( 'um_dropdown', UM_URL . 'assets/js/dropdown' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_members', UM_URL . 'assets/js/um-members' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), UM_VERSION, true );
wp_register_script( 'um_dropdown', $js_url . 'dropdown' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_members', $js_url . 'um-members' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), UM_VERSION, true );
wp_register_script( 'um_account', UM_URL . 'assets/js/um-account' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script( 'um_account', $js_url . 'um-account' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script( 'um_functions', UM_URL . 'assets/js/um-functions' . $suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util' ), UM_VERSION, true );
wp_register_script( 'um_responsive', UM_URL . 'assets/js/um-responsive' . $suffix . '.js', array( 'jquery', 'um_functions', 'um_crop' ), UM_VERSION, true );
wp_register_script( 'um_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util' ), UM_VERSION, true );
wp_register_script( 'um_responsive', $js_url . 'um-responsive' . $suffix . '.js', array( 'jquery', 'um_functions', 'um_crop' ), UM_VERSION, true );
// render blocks
wp_enqueue_script( 'um_conditional' );
@@ -171,15 +182,18 @@ 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 );
wp_register_style( 'um_members', $css_url . 'um-members' . $suffix . '.css', array( 'um_ui' ), UM_VERSION );
// RTL styles.
if ( is_rtl() ) {
wp_register_style( 'um_members_rtl', UM_URL . 'assets/css/um-members-rtl.css', array( 'um_members' ), UM_VERSION );
wp_style_add_data( 'um_members', 'rtl', true );
wp_style_add_data( 'um_members', 'suffix', $suffix );
}
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_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION );
wp_register_style( 'um_profile', $css_url . 'um-profile' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_responsive', $css_url . 'um-responsive' . $suffix . '.css', array( 'um_profile', 'um_crop' ), UM_VERSION );
wp_register_style( 'um_account', $css_url . 'um-account' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_default_css', $css_url . 'um-old-default' . $suffix . '.css', array(), UM_VERSION );
wp_enqueue_style( 'um_default_css' );
wp_enqueue_style( 'um_members' );
@@ -195,6 +209,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load Gutenberg scripts.
*
* @since 2.0.37
*/
private function load_gutenberg_js() {
/** This filter is documented in includes/core/class-blocks.php */
@@ -231,18 +247,30 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_style( 'um_block_css', $css_url . 'admin/block' . $suffix . '.css', array(), UM_VERSION );
wp_enqueue_style( 'um_block_css' );
/**
* Fires for enqueue assets for WordPress Gutenberg editor.
*
* @since 2.1.10
* @hook um_load_gutenberg_js
*
* @example <caption>Make some action on enqueue assets for WordPress Gutenberg editor.</caption>
* function my_load_gutenberg_js() {
* // your code here
* }
* add_action( 'um_load_gutenberg_js', 'my_load_gutenberg_js' );
*/
do_action( 'um_load_gutenberg_js' );
}
/**
* @since 2.7.1
* @since 2.8.0
*/
public function navmenu_scripts() {
add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_navmenu_scripts' ) );
}
/**
* @since 2.7.1
* @since 2.8.0
*/
public function enqueue_navmenu_scripts() {
$suffix = self::get_suffix();
@@ -277,18 +305,18 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* @since 2.7.1
* @since 2.8.0
*/
public function posts_page() {
if ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) {
if ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
add_action( 'admin_enqueue_scripts', array( &$this, 'forms_page_scripts' ) );
} elseif ( isset( $_GET['post_type'] ) && 'um_directory' === sanitize_key( $_GET['post_type'] ) ) {
} elseif ( isset( $_GET['post_type'] ) && 'um_directory' === sanitize_key( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
add_action( 'admin_enqueue_scripts', array( &$this, 'directories_page_scripts' ) );
}
}
/**
* @since 2.7.1
* @since 2.8.0
*/
public function forms_page_scripts() {
$suffix = self::get_suffix();
@@ -298,7 +326,7 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* @since 2.7.1
* @since 2.8.0
*/
public function directories_page_scripts() {
$suffix = self::get_suffix();
@@ -309,6 +337,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load Forms
*
* @since 2.0.0
*/
public function load_forms() {
$suffix = self::get_suffix();
@@ -327,6 +357,24 @@ final class Enqueue extends \um\common\Enqueue {
admin_url( 'admin.php' )
),
);
/**
* Filters data array for localize wp-admin forms scripts.
*
* @since 2.8.0
* @hook um_admin_forms_data_localize
*
* @param {array} $forms_data Data to localize.
*
* @return {array} Data to localize.
*
* @example <caption>Add `my_custom_variable` to wp-admin forms scripts to be callable via `um_forms_data.my_custom_variable` in JS.</caption>
* function um_custom_admin_forms_data_localize( $variables ) {
* $variables['{my_custom_variable}'] = '{my_custom_variable_value}';
* return $variables;
* }
* add_filter( 'um_admin_forms_data_localize', 'um_custom_admin_forms_data_localize' );
*/
$forms_data = apply_filters( 'um_admin_forms_data_localize', $forms_data );
wp_localize_script( 'um_admin_forms', 'um_forms_data', $forms_data );
@@ -343,6 +391,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load modal
*
* @since 2.0.0
*/
public function load_modal() {
$suffix = self::get_suffix();
@@ -359,6 +409,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load Builder
*
* @since 2.0.0
*/
public function load_builder() {
$this->enqueue_frontend_preview_assets();
@@ -382,6 +434,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Assets for FRONTEND PREVIEW.
*
* @since 2.0.37
*/
private function enqueue_frontend_preview_assets() {
$suffix = self::get_suffix();
@@ -396,10 +450,26 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_style( 'um_default_css', $css_url . 'um-old-default' . $suffix . '.css', array( 'um_fileupload', 'um_responsive', 'um_modal', 'um_styles', 'um_profile', 'um_misc' ), UM_VERSION );
wp_enqueue_style( 'um_default_css' );
/**
* Fires for enqueue assets on the UM form builder live preview.
*
* @since 2.8.0
* @hook um_enqueue_frontend_preview_assets
*
* @example <caption>Make some action on enqueue assets on the UM form builder live preview.</caption>
* function my_enqueue_frontend_preview_assets() {
* // your code here
* }
* add_action( 'um_enqueue_frontend_preview_assets', 'my_enqueue_frontend_preview_assets' );
*/
do_action( 'um_enqueue_frontend_preview_assets' );
}
/**
* Load global css
* Load global assets.
*
* @since 2.0.18
*/
public function load_global_scripts() {
$suffix = self::get_suffix();
@@ -413,7 +483,7 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Filters data array for localize wp-admin global scripts.
*
* @since 2.0
* @since 2.0.0
* @hook um_admin_enqueue_localize_data
*
* @param {array} $variables Data to localize.
@@ -438,6 +508,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Add Gutenberg category for UM shortcodes.
*
* @since 2.0.41
*
* @param array $categories
*
* @return array
@@ -462,6 +534,8 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Enqueue scripts and styles.
*
* @since 2.0.0
*
* @param string $hook wp-admin screen.
*/
public function admin_enqueue_scripts( $hook ) {
@@ -523,7 +597,7 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
*
* @since 2.0.43
*/
public function enqueue_cpt_scripts() {
if ( ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) || ( isset( $_GET['post'] ) && 'um_form' === get_post_type( absint( $_GET['post'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
@@ -535,12 +609,11 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* Print editor scripts if they are not printed by default
* Print editor scripts if they are not printed by default.
*
* @since 2.1.4
*/
public function admin_footer_scripts() {
/**
* @var $class \_WP_Editors
*/
$class = '\_WP_Editors';
if ( did_action( 'print_default_editor_scripts' ) ) {
@@ -563,7 +636,7 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* @since 2.7.1
* @since 2.8.0
* @param array $form_data
*
* @return array
includes/admin/class-screen.php
+22 -5
View File
@@ -8,16 +8,16 @@ if ( ! defined( 'ABSPATH' ) ) {
/**
* Class Screen
*
* @since 2.7.1
* @since 2.8.0
*
* @package um\admin
*/
class Screen {
/**
* Boolean check if we're viewing UM backend
* Boolean check if we're viewing UM backend.
*
* @since 2.7.1
* @since 2.8.0
*
* @return bool
*/
@@ -44,13 +44,30 @@ class Screen {
$is_um_screen = true;
}
/**
* Filters marker about displaying Ultimate Member screen in wp-admin or another one.
*
* @since 2.8.0
* @hook um_is_ultimatememeber_admin_screen
*
* @param {array} $variables Data to localize.
*
* @return {array} Data to localize.
*
* @example <caption>Add `my_custom_variable` to common scripts to be callable via `um_common_variables.my_custom_variable` in JS.</caption>
* function um_custom_common_js_variables( $variables ) {
* $variables['{my_custom_variable}'] = '{my_custom_variable_value}';
* return $variables;
* }
* add_filter( 'um_common_js_variables', 'um_custom_common_js_variables' );
*/
return apply_filters( 'um_is_ultimatememeber_admin_screen', $is_um_screen );
}
/**
* Check if current page load UM post type.
*
* @since 2.7.1
* @since 2.8.0
*
* @return bool
*/
@@ -75,7 +92,7 @@ class Screen {
/**
* If page now show content with restricted post/taxonomy.
*
* @since 2.7.1
* @since 2.8.0
*
* @return bool
*/
includes/admin/core/class-admin-notices.php
+1 -1
View File
@@ -684,7 +684,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
/**
* @note Removed for now to avoid the bad reviews.
* @deprecated 2.7.1
* @deprecated 2.8.0
*/
private function reviews_notice() {
$first_activation_date = get_option( 'um_first_activation_date', false );
includes/admin/core/class-admin-settings.php
+2 -2
View File
@@ -3400,7 +3400,7 @@ $request['cmd'] = '_notify-validate';
$params = array(
'sslverify' => false,
'timeout' => 60,
'user-agent' => 'UltimateMember/' . ultimatemember_version,
'user-agent' => 'UltimateMember/' . UM_VERSION,
'body' => $request
);
@@ -3420,7 +3420,7 @@ Memory Limit: <?php echo ( um_let_to_num( WP_MEMORY_LIMIT )/( 1024 ) )."MB
--- UM Configurations ---
Version: <?php echo ultimatemember_version . "\n"; ?>
Version: <?php echo UM_VERSION . "\n"; ?>
Upgraded From: <?php echo get_option( 'um_last_version_upgrade', 'None' ) . "\n"; ?>
Current URL Method: <?php echo UM()->options()->get( 'current_url_method' ). "\n"; ?>
Cache User Profile: <?php if( UM()->options()->get( 'um_profile_object_cache_stop' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
includes/class-functions.php
+2 -2
View File
@@ -335,12 +335,12 @@ if ( ! class_exists( 'UM_Functions' ) ) {
/**
* @deprecated 2.7.1
* @deprecated 2.8.0
*
* @return array
*/
public function cpt_list() {
_deprecated_function( __METHOD__, '2.7.1', 'UM()->common()->cpt()->get_list()' );
_deprecated_function( __METHOD__, '2.8.0', 'UM()->common()->cpt()->get_list()' );
return UM()->common()->cpt()->get_list();
}
includes/class-init.php
+1 -1
View File
@@ -921,7 +921,7 @@ if ( ! class_exists( 'UM' ) ) {
/**
* @since 2.0
* @depecated 2.7.0
* @deprecated 2.7.0
*
* @return um\admin\Enqueue
*/
includes/common/class-cpt.php
+2 -2
View File
@@ -90,7 +90,7 @@ if ( ! class_exists( 'um\common\CPT' ) ) {
}
/**
* @since 2.7.1
* @since 2.8.0
* @return array
*/
public function get_list() {
@@ -123,7 +123,7 @@ if ( ! class_exists( 'um\common\CPT' ) ) {
/**
* @param null|string $post_type
*
* @since 2.7.1
* @since 2.8.0
*
* @return array
*/
includes/common/class-enqueue.php
+59 -1
View File
@@ -47,6 +47,14 @@ class Enqueue {
add_action( 'enqueue_block_assets', array( &$this, 'common_libs' ), 9 );
}
/**
* Get assets URL.
* @since 2.7.0
*
* @param string $type Can be "js", "css" or "libs".
*
* @return string
*/
public static function get_url( $type ) {
if ( ! in_array( $type, array( 'js', 'css', 'libs' ), true ) ) {
return '';
@@ -55,6 +63,13 @@ class Enqueue {
return self::$urls[ $type ];
}
/**
* Get scripts minified suffix.
*
* @since 2.7.0
*
* @return string
*/
public static function get_suffix() {
if ( empty( self::$suffix ) ) {
self::$suffix = ( ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) || ( defined( 'UM_SCRIPT_DEBUG' ) && UM_SCRIPT_DEBUG ) ) ? '' : '.min';
@@ -71,6 +86,13 @@ class Enqueue {
wp_register_style( 'um_ui', self::get_url( 'libs' ) . 'jquery-ui/jquery-ui' . self::get_suffix() . '.css', array(), '1.13.2' );
}
/**
* Get Pickadate.JS locale.
*
* @since 2.8.0
*
* @return string
*/
private function get_pickadate_locale() {
$suffix = self::get_suffix();
$locale = get_locale();
@@ -135,6 +157,24 @@ class Enqueue {
}
}
/**
* Filters Ultimate Member Pickadate.JS locale.
*
* @since 2.8.0
* @hook um_get_pickadate_locale
*
* @param {string} $locale Pickadate.JS locale.
* @param {string} $suffix Ultimate Member scripts suffix.
*
* @return {string} Pickadate.JS locale.
*
* @example <caption>Change Ultimate Member Pickadate.JS locale.</caption>
* function custom_um_get_pickadate_locale( $locale, $suffix ) {
* $locale = 'th_TH';
* return $locale;
* }
* add_filter( 'um_get_pickadate_locale', 'custom_um_get_pickadate_locale', 10, 2 );
*/
return apply_filters( 'um_get_pickadate_locale', $locale, $suffix );
}
@@ -156,6 +196,7 @@ class Enqueue {
// Raty JS for rating field-type.
wp_register_script( 'um_raty', $libs_url . 'raty/um-raty' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), '2.6.0', true );
wp_set_script_translations( 'um_raty', 'ultimate-member' );
wp_register_style( 'um_raty', $libs_url . 'raty/um-raty' . $suffix . '.css', array(), '2.6.0' );
// Legacy FontIcons.
@@ -163,6 +204,23 @@ class Enqueue {
wp_register_style( 'um_fonticons_fa', $libs_url . 'legacy/fonticons/fonticons-fa' . $suffix . '.css', array(), UM_VERSION ); // FontAwesome
// Select2 JS.
/**
* Filters marker for dequeue select2.JS library.
*
* @since 2.0.0
* @hook um_dequeue_select2_scripts
*
* @param {bool} $dequeue_select2 Dequeue select2 assets marker. Set to `true` for dequeue scripts.
*
* @return {bool} Dequeue select2 assets. By default `false`.
*
* @example <caption>Dequeue select2 assets.</caption>
* function custom_um_dequeue_select2_scripts( $dequeue_select2 ) {
* $dequeue_select2 = true;
* return $dequeue_select2;
* }
* add_filter( 'um_dequeue_select2_scripts', 'custom_um_dequeue_select2_scripts' );
*/
$dequeue_select2 = apply_filters( 'um_dequeue_select2_scripts', false );
if ( class_exists( 'WooCommerce' ) || $dequeue_select2 ) {
wp_dequeue_style( self::$select2_handle );
@@ -223,7 +281,7 @@ class Enqueue {
/**
* Filters data array for localize frontend common scripts.
*
* @since 2.7.1
* @since 2.8.0
* @hook um_common_js_variables
*
* @param {array} $variables Data to localize.
includes/core/class-form.php
+1 -1
View File
@@ -66,7 +66,7 @@ if ( ! class_exists( 'um\core\Form' ) ) {
/**
* Hook for singleton
* @since 2.7.1
* @since 2.8.0
*/
public function hooks() {
add_action( 'template_redirect', array( &$this, 'form_init' ), 2 );
includes/core/class-shortcodes.php
+1 -5
View File
@@ -716,11 +716,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
if ( 'directory' === $args['mode'] ) {
wp_enqueue_script( 'um_members' );
if ( is_rtl() ) {
wp_enqueue_style( 'um_members_rtl' );
} else {
wp_enqueue_style( 'um_members' );
}
wp_enqueue_style( 'um_members' );
}
if ( 'directory' !== $args['mode'] ) {
includes/frontend/class-enqueue.php
+145 -152
View File
@@ -14,36 +14,33 @@ final class Enqueue extends \um\common\Enqueue {
/**
* @var string
* @deprecated 2.8.0
*/
var $js_baseurl = '';
public $js_baseurl = '';
/**
* @var string
* @deprecated 2.8.0
*/
var $css_baseurl = '';
public $css_baseurl = '';
/**
* Enqueue constructor.
*/
public function __construct() {
parent::__construct();
$this->js_baseurl = UM_URL . 'assets/js/';
$this->css_baseurl = UM_URL . 'assets/css/';
add_action( 'init', array( &$this, 'scripts_enqueue_priority' ) );
}
/**
*
* @since 2.1.3
*/
public function scripts_enqueue_priority() {
add_action( 'wp_enqueue_scripts', array( &$this, 'wp_enqueue_scripts' ), $this->get_priority() );
}
/**
* @since 2.1.3
* @return int
*/
public function get_priority() {
@@ -68,13 +65,14 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
* Register JS scripts.
*
* @since 2.0.30
*/
public function register_scripts() {
$suffix = self::get_suffix();
$libs_url = self::get_url( 'libs' );
$js_url = self::get_url( 'js' );
$css_url = self::get_url( 'css' );
// Cropper.js
wp_register_script( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.js', array( 'jquery' ), '1.6.1', true );
@@ -85,7 +83,7 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Filters data array for localize frontend common scripts.
*
* @since 2.7.1
* @since 2.8.0
* @hook um_frontend_common_js_variables
*
* @param {array} $variables Data to localize.
@@ -105,88 +103,111 @@ final class Enqueue extends \um\common\Enqueue {
// uploadFiles scripts + UM custom styles for uploader.
wp_register_script( 'um_jquery_form', $libs_url . 'jquery-form/jquery-form' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_fileupload', $libs_url . 'fileupload/fileupload.js', array( 'um_jquery_form' ), UM_VERSION, true );
wp_register_style( 'um_fileupload', $css_url . 'um-fileupload' . $suffix . '.css', array(), UM_VERSION );
wp_register_script( 'um_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'um_fileupload' ), UM_VERSION, true );
wp_register_script( 'um_modal', $this->js_baseurl . 'um-modal' . $suffix . '.js', array( 'um_frontend_common' ), UM_VERSION, true );
wp_register_script( 'um_modal', $js_url . 'um-modal' . $suffix . '.js', array( 'um_frontend_common' ), UM_VERSION, true );
wp_register_script( 'um_functions', $this->js_baseurl . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'jquery-masonry' ), UM_VERSION, true );
wp_register_script( 'um_responsive', $this->js_baseurl . 'um-responsive' . $suffix . '.js', array( 'um_functions' ), UM_VERSION, true );
wp_register_script( 'um_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'jquery-masonry' ), UM_VERSION, true );
wp_register_script( 'um_responsive', $js_url . 'um-responsive' . $suffix . '.js', array( 'um_functions' ), UM_VERSION, true );
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', self::$select2_handle, 'um_raty' ), UM_VERSION, true );
wp_register_script( 'um-gdpr', $js_url . 'um-gdpr' . $suffix . '.js', array( 'jquery' ), UM_VERSION, false );
wp_register_script( 'um_conditional', $js_url . 'um-conditional' . $suffix . '.js', array( 'jquery', 'wp-hooks' ), UM_VERSION, true );
wp_register_script( 'um_scripts', $js_url . '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 ) {
$max_upload_size = 0;
}
$localize_data = array(
'max_upload_size' => $max_upload_size,
'nonce' => wp_create_nonce( 'um-frontend-nonce' ),
);
/**
* UM hook
* Filters data array for localize frontend scripts.
*
* @type filter
* @title um_enqueue_localize_data
* @description Extend UM localized data
* @input_vars
* [{"var":"$data","type":"array","desc":"Localize Array"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_enqueue_localize_data', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_enqueue_localize_data', 'my_enqueue_localize_data', 10, 1 );
* function my_enqueue_localize_data( $data ) {
* @param {array} $variables Data to localize.
*
* @return {array} Data to localize.
*
* @since 2.0.0
* @hook um_enqueue_localize_data
*
* @example <caption>Extend UM localized data.</caption>
* function my_enqueue_localize_data( $variables ) {
* // your code here
* return $data;
* return $variables;
* }
* ?>
* add_filter( 'um_enqueue_localize_data', 'my_enqueue_localize_data' );
*/
$localize_data = apply_filters( 'um_enqueue_localize_data', array(
'max_upload_size' => $max_upload_size,
'nonce' => wp_create_nonce( "um-frontend-nonce" ),
) );
$localize_data = apply_filters( 'um_enqueue_localize_data', $localize_data );
wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
wp_register_script('um_dropdown', $this->js_baseurl . 'dropdown' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_dropdown', $js_url . 'dropdown' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script('um_members', $this->js_baseurl . 'um-members' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), UM_VERSION, true );
wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-i18n', 'um_scripts' ), UM_VERSION, true );
wp_register_script( 'um_members', $js_url . 'um-members' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), UM_VERSION, true );
wp_register_script( 'um_profile', $js_url . 'um-profile' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-i18n', 'um_scripts' ), UM_VERSION, true );
wp_set_script_translations( 'um_profile', 'ultimate-member' );
/**
* Filters account script dependencies.
*
* @since 2.1.8
* @hook um_account_scripts_dependencies
*
* @param {array} $deps JS script dependencies.
*
* @return {array} JS script dependencies.
*
* @example <caption>Add `wp-util` as a dependencies script.</caption>
* function um_custom_account_scripts_dependencies( $deps ) {
* $deps[] = 'wp-util';
* return $deps;
* }
* add_filter( 'um_account_scripts_dependencies', 'um_custom_account_scripts_dependencies' );
*/
$account_deps = apply_filters( 'um_account_scripts_dependencies', array( 'jquery', 'wp-hooks', 'um_scripts' ) );
wp_register_script('um_account', $this->js_baseurl . 'um-account' . $suffix . '.js', $account_deps, UM_VERSION, true );
wp_register_script( 'um_account', $js_url . 'um-account' . $suffix . '.js', $account_deps, UM_VERSION, true );
}
/**
* Register styles
* Register styles.
*
* @since 2.0.30
*/
public function register_styles() {
$suffix = self::get_suffix();
$css_url = self::get_url( 'css' );
wp_register_style( 'um_fileupload', $css_url . 'um-fileupload' . $suffix . '.css', array(), UM_VERSION );
//FontAwesome and FontIcons styles
wp_register_style( 'um_rtl', $this->css_baseurl . 'um.rtl.css', array(), UM_VERSION );
wp_register_style( 'um_default_css', $this->css_baseurl . 'um-old-default.css', array(), UM_VERSION );
wp_register_style( 'um_modal', $this->css_baseurl . 'um-modal.css', array(), UM_VERSION );
wp_register_style( 'um_responsive', $this->css_baseurl . 'um-responsive.css', array( 'um_profile' ), UM_VERSION );
wp_register_style( 'um_rtl', $css_url . 'um.rtl' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_default_css', $css_url . 'um-old-default' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_modal', $css_url . 'um-modal' . $suffix . '.css', array(), UM_VERSION );
wp_register_style( 'um_responsive', $css_url . 'um-responsive' . $suffix . '.css', array( 'um_profile' ), 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', 'select2', 'um_fileupload', 'um_common' ), UM_VERSION );
wp_register_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2', 'um_fileupload', 'um_common' ), UM_VERSION );
wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array( 'um_styles' ), UM_VERSION );
wp_register_style( 'um_members', $css_url . 'um-members' . $suffix . '.css', array( 'um_styles' ), UM_VERSION );
// RTL styles.
if ( is_rtl() ) {
wp_register_style( 'um_members_rtl', $this->css_baseurl . 'um-members-rtl.css', array( 'um_members' ), UM_VERSION );
wp_style_add_data( 'um_members', 'rtl', true );
wp_style_add_data( 'um_members', 'suffix', $suffix );
}
wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array( 'um_styles', 'um_crop' ), 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 );
wp_register_style( 'um_profile', $css_url . 'um-profile' . $suffix . '.css', array( 'um_styles', 'um_crop' ), UM_VERSION );
wp_register_style( 'um_account', $css_url . 'um-account' . $suffix . '.css', array( 'um_styles' ), UM_VERSION );
wp_register_style( 'um_misc', $css_url . 'um-misc' . $suffix . '.css', array( 'um_styles' ), UM_VERSION );
}
/**
* Enqueue scripts and styles
* Enqueue scripts and styles.
*
* @since 2.0.0
*/
function wp_enqueue_scripts() {
public function wp_enqueue_scripts() {
$this->register_scripts();
$this->register_styles();
@@ -198,7 +219,7 @@ final class Enqueue extends \um\common\Enqueue {
}
global $post;
if ( is_object( $post ) && has_shortcode( $post->post_content,'ultimatemember' ) ) {
if ( is_object( $post ) && has_shortcode( $post->post_content, 'ultimatemember' ) ) {
wp_dequeue_script( 'jquery-form' );
}
@@ -208,145 +229,117 @@ final class Enqueue extends \um\common\Enqueue {
$this->old_css_settings();
}
/**
*
* @since 2.0.30
*/
function old_css_settings() {
$uploads = wp_upload_dir();
$upload_dir = $uploads['basedir'] . DIRECTORY_SEPARATOR . 'ultimatemember' . DIRECTORY_SEPARATOR;
public function old_css_settings() {
$uploads = wp_upload_dir();
$upload_dir = $uploads['basedir'] . DIRECTORY_SEPARATOR . 'ultimatemember' . DIRECTORY_SEPARATOR;
if ( file_exists( $upload_dir . 'um_old_settings.css' ) ) {
wp_register_style( 'um_old_css', UM_URL . '../../uploads/ultimatemember/um_old_settings.css' );
wp_register_style( 'um_old_css', UM_URL . '../../uploads/ultimatemember/um_old_settings.css', array(), '2.0.0' );
wp_enqueue_style( 'um_old_css' );
}
}
/**
* This will load original files (not minified)
*
* @since 2.0.0
*/
function load_original() {
// $this->load_selectjs();
public function load_original() {
$this->load_modal();
$this->load_css();
$this->load_fileupload();
$this->load_functions();
$this->load_responsive();
$this->load_customjs();
}
/**
* Include Google charts
* @depecated 2.7.1
* Load plugin CSS
*
* @since 2.0.0
*/
function load_google_charts() {
}
/**
* Load plugin css
*/
function load_css() {
public function load_css() {
wp_enqueue_style( 'um_styles' );
/*if ( is_rtl() ) {
wp_enqueue_style( 'um_members_rtl' );
} else {
wp_enqueue_style( 'um_members' );
}*/
wp_enqueue_style( 'um_profile' );
wp_enqueue_style( 'um_account' );
wp_enqueue_style( 'um_misc' );
}
/**
* Load select-dropdowns JS
* @depecated 2.7.0
* Load JS functions.
*
* @since 2.0.0
*/
function load_selectjs() {
}
/**
* Load fileupload JS
* @depecated 2.7.1
*/
function load_fileupload() {
}
/**
* Load JS functions
*/
function load_functions() {
wp_enqueue_script('um_functions' );
public function load_functions() {
wp_enqueue_script( 'um_functions' );
wp_enqueue_script( 'um-gdpr' );
}
/**
* Load custom JS
*/
function load_customjs() {
wp_enqueue_script('um_conditional');
wp_enqueue_script('um_scripts');
//wp_enqueue_script('um_members');
wp_enqueue_script('um_profile');
wp_enqueue_script('um_account');
}
/**
* Load date & time picker
* @depecated 2.7.1
*/
function load_datetimepicker() {
}
/**
* Load scrollbar
* @depecated 2.7.1
*/
function load_scrollbar(){
}
/**
* Load crop script
* @depecated 2.7.1
*/
function load_imagecrop() {
}
/**
* Load rating
* Load custom JS.
*
* @depecated 2.7.0
* @since 2.0.0
*/
function load_raty() {
public function load_customjs() {
wp_enqueue_script( 'um_conditional' );
wp_enqueue_script( 'um_scripts' );
wp_enqueue_script( 'um_profile' );
wp_enqueue_script( 'um_account' );
}
/**
* Load modal
* Load modal.
*
* @since 2.0.0
*/
function load_modal() {
public function load_modal() {
wp_enqueue_script( 'um_modal' );
wp_enqueue_style( 'um_modal' );
}
/**
* Load responsive styles
* Load responsive styles.
*
* @since 2.0.0
*/
function load_responsive() {
public function load_responsive() {
wp_enqueue_script( 'um_responsive' );
wp_enqueue_style( 'um_responsive' );
}
/**
* Include Google charts
* @deprecated 2.8.0
*/
public function load_google_charts() {
}
/**
* Load fileupload JS
* @deprecated 2.8.0
*/
public function load_fileupload() {
}
/**
* Load date & time picker
* @deprecated 2.8.0
*/
public function load_datetimepicker() {
}
/**
* Load scrollbar
* @deprecated 2.8.0
*/
public function load_scrollbar() {
}
/**
* Load crop script
* @deprecated 2.8.0
*/
public function load_imagecrop() {
}
}