").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery($um_tiny_editor).html()),n=void 0===tinyMCEPreInit.mceInit[e]?tinyMCEPreInit.mceInit[e]=tinyMCE.extend({},tinyMCEPreInit.mceInit[e]):tinyMCEPreInit.mceInit[e],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(e),tinyMCE.init(n),tinyMCE.get(e).setContent(i),a):($um_tiny_editor=jQuery("
").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery($um_tiny_editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),jQuery("#"+e))).html(i),jQuery("body").on("click",".wp-switch-editor",function(){var i=jQuery(this);i.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(i=i.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(e,i))})}function um_admin_modal_ajaxcall(e,i,n,a){in_row="",in_sub_row="",in_column="",in_group="",jQuery(".um-col-demon-settings").data("in_column")&&(in_row=jQuery(".um-col-demon-settings").data("in_row"),in_sub_row=jQuery(".um-col-demon-settings").data("in_sub_row"),in_column=jQuery(".um-col-demon-settings").data("in_column"),in_group=jQuery(".um-col-demon-settings").data("in_group"));var m=jQuery("input[type=hidden][id=form__um_mode]").val();return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:e,arg1:i,arg2:n,arg3:a,in_row:in_row,in_sub_row:in_sub_row,in_column:in_column,in_group:in_group,nonce:um_admin_scripts.nonce,form_mode:m},complete:function(){um_admin_modal_loaded(),um_admin_modal_responsive()},success:function(i){jQuery(".um-admin-modal").find(".um-admin-modal-body").html(i),wp.hooks.doAction("um_admin_modal_success_result",jQuery(".um-admin-modal")),um_admin_live_update_scripts(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0
'),jQuery(i).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==i&&(UM.common.tipsy.hide(),um_admin_remove_modal())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var i=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),i.find('input[type="hidden"]').val(""),i.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(i=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),i.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),um_admin_modal_responsive()})});
\ No newline at end of file
diff --git a/assets/js/um-responsive.js b/assets/js/um-responsive.js
index ace4e1fe..092d571f 100644
--- a/assets/js/um-responsive.js
+++ b/assets/js/um-responsive.js
@@ -11,3 +11,10 @@ jQuery(window).on( 'resize', function() {
um_responsive();
um_modal_responsive();
});
+
+wp.hooks.addAction( 'um_admin_modal_success_result', 'um_frontend_responsive', function( $adminModal ) {
+ // Make responsive script only when live preview,
+ if ( $adminModal.find('.um-admin-modal-body').find('.um').length ) {
+ um_responsive();
+ }
+});
diff --git a/assets/js/um-responsive.min.js b/assets/js/um-responsive.min.js
index 270f6742..b06beafd 100644
--- a/assets/js/um-responsive.min.js
+++ b/assets/js/um-responsive.min.js
@@ -1 +1 @@
-jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()});
\ No newline at end of file
+jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()}),wp.hooks.addAction("um_admin_modal_success_result","um_frontend_responsive",function(o){console.log(123131232),o.find(".um-admin-modal-body").find(".um").length&&um_responsive()});
\ No newline at end of file
diff --git a/assets/js/um-fileupload.js b/assets/libs/fileupload/fileupload.js
similarity index 100%
rename from assets/js/um-fileupload.js
rename to assets/libs/fileupload/fileupload.js
diff --git a/assets/js/um-jquery-form.js b/assets/libs/jquery-form/jquery-form.js
similarity index 100%
rename from assets/js/um-jquery-form.js
rename to assets/libs/jquery-form/jquery-form.js
diff --git a/assets/js/um-jquery-form.min.js b/assets/libs/jquery-form/jquery-form.min.js
similarity index 100%
rename from assets/js/um-jquery-form.min.js
rename to assets/libs/jquery-form/jquery-form.min.js
diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php
index 448addfc..d2b4d89c 100644
--- a/includes/admin/class-enqueue.php
+++ b/includes/admin/class-enqueue.php
@@ -104,7 +104,6 @@ final class Enqueue extends \um\common\Enqueue {
public function block_editor() {
$suffix = self::get_suffix();
$libs_url = self::get_url( 'libs' );
- $this->register_jquery_ui();
wp_register_style( 'um_members', UM_URL . 'assets/css/um-members.css', array( 'um_ui' ), UM_VERSION );
if ( is_rtl() ) {
@@ -277,9 +276,6 @@ final class Enqueue extends \um\common\Enqueue {
wp_enqueue_style( 'um_admin_nav_menu' );
}
-
-
-
/**
*
*/
@@ -292,50 +288,50 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
- *
+ * Assets for FRONTEND PREVIEW.
*/
public function enqueue_frontend_preview_assets() {
$suffix = self::get_suffix();
+ $js_url = self::get_url( 'js' );
+ $css_url = self::get_url( 'css' );
$libs_url = self::get_url( 'libs' );
- $this->register_jquery_ui();
+ // Cropper.js
+ wp_register_script( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.js', array( 'jquery' ), '1.6.1', true );
+ wp_register_style( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.css', array(), '1.6.1' );
- // Scripts for frontend preview.
- UM()->frontend()->enqueue()->load_css();
- UM()->frontend()->enqueue()->load_modal();
- UM()->frontend()->enqueue()->load_responsive();
+ wp_register_script( 'um_frontend_common', $js_url . 'common-frontend' . $suffix . '.js', array( 'um_common', 'um_crop' ), UM_VERSION, true );
+ $um_common_variables = array();
+ /**
+ * Filters data array for localize frontend common scripts.
+ *
+ * @since 2.7.1
+ * @hook um_frontend_common_js_variables
+ *
+ * @param {array} $variables Data to localize.
+ *
+ * @return {array} Data to localize.
+ *
+ * @example Add `my_custom_variable` to common frontend scripts to be callable via `um_frontend_common_variables.my_custom_variable` in JS.
+ * function um_custom_frontend_common_js_variables( $variables ) {
+ * $variables['{my_custom_variable}'] = '{my_custom_variable_value}';
+ * return $variables;
+ * }
+ * add_filter( 'um_frontend_common_js_variables', 'um_custom_frontend_common_js_variables' );
+ */
+ $um_common_variables = apply_filters( 'um_frontend_common_js_variables', $um_common_variables );
+ wp_localize_script( 'um_frontend_common', 'um_frontend_common_variables', $um_common_variables );
- wp_register_style( 'um_default_css', UM_URL . 'assets/css/um-old-default.css', '', ultimatemember_version, 'all' );
- wp_enqueue_style( 'um_default_css' );
+ 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( 'jquery', 'um_jquery_form' ), UM_VERSION, true );
- //scripts for FRONTEND PREVIEW
- 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_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'um_fileupload' ), UM_VERSION, true );
+ wp_enqueue_script( 'um_functions' );
- wp_register_script( 'um_functions', $this->front_js_baseurl . 'um-functions' . $suffix . '.js', array( 'jquery', 'um_tipsy' ), UM_VERSION, true );
-
- wp_register_script( 'um_datetime', $this->front_js_baseurl . 'pickadate/picker.js', array( 'jquery' ), UM_VERSION, true );
- wp_register_script( 'um_datetime_date', $this->front_js_baseurl . 'pickadate/picker.date.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- wp_register_script( 'um_datetime_time', $this->front_js_baseurl . 'pickadate/picker.time.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- //wp_register_script( 'um_datetime_legacy', $this->front_js_baseurl . 'pickadate/legacy.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- // load a localized version for date/time
- $locale = get_locale();
- if ( $locale ) {
- if ( file_exists( WP_LANG_DIR . '/plugins/ultimate-member/assets/js/pickadate/' . $locale . '.js' ) ) {
- wp_register_script( 'um_datetime_locale', content_url() . '/languages/plugins/ultimate-member/assets/js/pickadate/' . $locale . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- } elseif ( file_exists( UM_PATH . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) {
- wp_register_script( 'um_datetime_locale', UM_URL . 'assets/js/pickadate/translations/' . $locale . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- }
- }
-
- wp_register_script( 'um_scripts', $this->front_js_baseurl . 'um-scripts' . $suffix . '.js', array( 'um_functions', 'um_crop', 'um_raty', self::$select2_handle, 'um_jquery_form', 'um_fileupload', 'um_datetime', 'um_datetime_date', 'um_datetime_time'/*, 'um_datetime_legacy'*/ ), UM_VERSION, true );
+ wp_register_script( 'um_scripts', $this->front_js_baseurl . 'um-scripts' . $suffix . '.js', array( 'um_functions', 'um_crop', 'um_raty', self::$select2_handle, 'um_fileupload', 'um_datetime', 'um_datetime_date', 'um_datetime_time'/*, 'um_datetime_legacy'*/ ), UM_VERSION, true );
wp_register_script( 'um_responsive', $this->front_js_baseurl . 'um-responsive' . $suffix . '.js', array( 'um_scripts', 'um_crop' ), UM_VERSION, true );
wp_register_script( 'um_modal', $this->front_js_baseurl . 'um-modal' . $suffix . '.js', array( 'um_responsive' ), UM_VERSION, true );
- wp_register_style( 'um_datetime', $this->front_css_baseurl . 'pickadate/default.css', array(), UM_VERSION );
- wp_register_style( 'um_datetime_date', $this->front_css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), UM_VERSION );
- wp_register_style( 'um_datetime_time', $this->front_css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), UM_VERSION );
-
wp_register_style( 'um_responsive', $this->front_css_baseurl . 'um-responsive.css', array(), UM_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( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION );
@@ -345,6 +341,11 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), ultimatemember_version );
wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'select2' ), UM_VERSION );
+ // Scripts for frontend preview.
+ UM()->frontend()->enqueue()->load_css();
+ UM()->frontend()->enqueue()->load_modal();
+ UM()->frontend()->enqueue()->load_responsive();
+
wp_enqueue_script( 'um_modal' );
wp_enqueue_style( 'um_default_css' );
}
diff --git a/includes/common/class-enqueue.php b/includes/common/class-enqueue.php
index 3ad57ea2..ca321edf 100644
--- a/includes/common/class-enqueue.php
+++ b/includes/common/class-enqueue.php
@@ -124,9 +124,9 @@ class Enqueue {
self::$select2_handle = 'um_select2_locale';
}
}
-
wp_register_style( 'select2', $libs_url . 'select2/select2' . $suffix . '.css', array(), '4.0.13' );
+ // Date-time picker (Pickadate.JS)
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 );
@@ -144,10 +144,6 @@ 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 );
-// // Modal
-// wp_register_script( 'um-modal', $this->urls['libs'] . 'modal/um-modal' . $this->suffix . '.js', array( 'jquery', 'wp-i18n', 'wp-hooks' ), UM_VERSION, true );
-// wp_register_style( 'um-modal', $this->urls['libs'] . 'modal/um-modal' . $this->suffix . '.css', array(), UM_VERSION );
-
wp_register_script( 'um_common', $js_url . 'common' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-hooks', 'um_tipsy' ), UM_VERSION, true );
$um_common_variables = array(
'locale' => get_locale(),
diff --git a/includes/frontend/class-enqueue.php b/includes/frontend/class-enqueue.php
index 9c710df7..1836b005 100644
--- a/includes/frontend/class-enqueue.php
+++ b/includes/frontend/class-enqueue.php
@@ -101,22 +101,10 @@ final class Enqueue extends \um\common\Enqueue {
$um_common_variables = apply_filters( 'um_frontend_common_js_variables', $um_common_variables );
wp_localize_script( 'um_frontend_common', 'um_frontend_common_variables', $um_common_variables );
- wp_register_script( 'um_jquery_form', $this->js_baseurl . 'um-jquery-form' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
- wp_register_script( 'um_fileupload', $this->js_baseurl . 'um-fileupload.js', array( 'jquery', 'um_jquery_form' ), UM_VERSION, true );
+ 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( 'jquery', 'um_jquery_form' ), UM_VERSION, true );
- wp_register_script( 'um_datetime', $this->js_baseurl . 'pickadate/picker.js', array( 'jquery' ), UM_VERSION, true );
- wp_register_script( 'um_datetime_date', $this->js_baseurl . 'pickadate/picker.date.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- wp_register_script( 'um_datetime_time', $this->js_baseurl . 'pickadate/picker.time.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
-// wp_register_script( 'um_datetime_legacy', $this->js_baseurl . 'pickadate/legacy.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- // load a localized version for date/time
- $locale = get_locale();
- if ( $locale ) {
- if ( file_exists( WP_LANG_DIR . '/plugins/ultimate-member/assets/js/pickadate/' . $locale . '.js' ) ) {
- wp_register_script('um_datetime_locale', content_url() . '/languages/plugins/ultimate-member/assets/js/pickadate/' . $locale . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- } elseif ( file_exists( UM_PATH . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) {
- wp_register_script('um_datetime_locale', UM_URL . 'assets/js/pickadate/translations/' . $locale . '.js', array( 'jquery', 'um_datetime' ), UM_VERSION, true );
- }
- }
+ 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 );
@@ -126,6 +114,12 @@ 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 );
+
+ $max_upload_size = wp_max_upload_size();
+ if ( ! $max_upload_size ) {
+ $max_upload_size = 0;
+ }
+
/**
* UM hook
*
@@ -146,12 +140,6 @@ final class Enqueue extends \um\common\Enqueue {
* }
* ?>
*/
-
- $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" ),
@@ -176,9 +164,6 @@ final class Enqueue extends \um\common\Enqueue {
public function register_styles() {
//FontAwesome and FontIcons styles
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 );
- wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), UM_VERSION );
- wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), UM_VERSION );
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 );