From 6e0836a4f8426f64b97634e646444afc0687a4fc Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 15 Aug 2018 13:24:22 +0300 Subject: [PATCH] - wp native ajax fix --- assets/js/um-modal.min.js | 2 +- assets/js/um-profile.min.js | 2 +- assets/js/um-scripts.js | 8 +++-- assets/js/um-scripts.min.js | 2 +- includes/admin/assets/js/um-admin-ajax.js | 4 +-- includes/admin/assets/js/um-admin-builder.js | 3 +- includes/admin/assets/js/um-admin-dragdrop.js | 2 +- includes/admin/assets/js/um-admin-field.js | 6 ++-- includes/admin/assets/js/um-admin-modal.js | 8 ++--- includes/admin/class-admin.php | 10 ++++++ includes/admin/core/class-admin-dragdrop.php | 1 + includes/admin/core/class-admin-enqueue.php | 34 +++---------------- includes/admin/core/class-admin-menu.php | 14 +++++--- .../templates/modal/dynamic_edit_field.php | 1 + .../templates/modal/dynamic_edit_row.php | 1 + .../templates/modal/dynamic_new_divider.php | 1 + .../templates/modal/dynamic_new_field.php | 1 + .../templates/modal/dynamic_new_group.php | 1 + includes/core/class-ajax-common.php | 3 +- includes/core/class-enqueue.php | 34 ++----------------- 20 files changed, 56 insertions(+), 82 deletions(-) diff --git a/assets/js/um-modal.min.js b/assets/js/um-modal.min.js index aaef54ce..abe282d2 100644 --- a/assets/js/um-modal.min.js +++ b/assets/js/um-modal.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){jQuery(document).on("click",".um-popup-overlay",function(){remove_Modal()}),jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a',function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-modal .um-single-file-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-fileinfo a").attr("href");return a.find(".um-single-file-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive(),jQuery.ajax({url:um_scripts.remove_file,type:"post",data:{src:t}}),!1}),jQuery(document).on("click",".um-modal .um-single-image-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview img").attr("src");return jQuery("img.cropper-hidden").cropper("destroy"),a.find(".um-single-image-preview img").attr("src",""),a.find(".um-single-image-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive(),jQuery.ajax({url:um_scripts.remove_file,type:"post",data:{src:t}}),!1}),jQuery(document).on("click",".um-finish-upload.file:not(.disabled)",function(){var e=jQuery(this).attr("data-key"),a=jQuery(this).parents(".um-modal-body").find(".um-single-file-preview").html();um_remove_modal(),jQuery(".um-single-file-preview[data-key="+e+"]").fadeIn().html(a);var t=jQuery(".um-field[data-key="+e+"]").find(".um-single-fileinfo a").data("file");jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find(".um-btn-auto-width").html(jQuery(this).attr("data-change")),jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find('input[type="hidden"]').val(t)}),jQuery(document).on("click",".um-finish-upload.image:not(.disabled)",function(){var a=jQuery(this),t=jQuery(this).attr("data-key"),e=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview"),i=e.find("img").attr("src"),r=e.attr("data-coord"),u=e.find("img").data("file"),m=0;jQuery(this).parents("#um_upload_single").data("user_id")&&(m=jQuery(this).parents("#um_upload_single").data("user_id")),r?(jQuery(this).html(jQuery(this).attr("data-processing")).addClass("disabled"),jQuery.ajax({url:um_scripts.resize_image,type:"POST",dataType:"json",data:{src:i,coord:r,user_id:m,key:t},success:function(e){1==e.success&&(d=new Date,"profile_photo"==t&&jQuery(".um-profile-photo-img img").attr("src",e.data.image.source_url+"?"+d.getTime()),"cover_photo"==t&&(jQuery(".um-cover-e").empty().html(''),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0'),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0'),jQuery(".um-dropdown").hide(),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:um_scripts.delete_cover_photo,type:"post",data:{metakey:metakey,user_id:user_id},success:function(e){t.hide()}})}),e(),jQuery("textarea[id=um-meta-bio]").change(e),jQuery("textarea[id=um-meta-bio]").keyup(e),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm("Are you sure that you want to delete this user?"))return!1})}); \ No newline at end of file +jQuery(document).ready(function(){function e(){if(void 0!==jQuery("textarea[id=um-meta-bio]").val()){var e=jQuery("textarea[id=um-meta-bio]").attr("data-character-limit")-jQuery("textarea[id=um-meta-bio]").val().length;jQuery("span.um-meta-bio-character span.um-bio-limit").text(e),e<5?jQuery("span.um-meta-bio-character").css("color","red"):jQuery("span.um-meta-bio-character").css("color","")}}jQuery(".um-profile.um-viewing .um-profile-body .um-row").each(function(){var e=jQuery(this);0==e.find(".um-field").length&&(e.prev(".um-row-heading").remove(),e.remove())}),jQuery(".um-profile.um-viewing .um-profile-body").length&&0==jQuery(".um-profile.um-viewing .um-profile-body").find(".um-field").length&&(jQuery(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um").find("form").submit(),!1}),jQuery(document).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-photo-modal",function(e){e.preventDefault();var t=jQuery(this).attr("data-src");return um_new_modal("um_view_photo","fit",!0,t),!1}),jQuery(document).on("click",".um-reset-profile-photo",function(e){jQuery(".um-profile-photo-img img").attr("src",jQuery(this).attr("data-default_src")),user_id=jQuery(this).attr("data-user_id"),metakey="profile_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id}})}),jQuery(document).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html(''),jQuery(".um-dropdown").hide(),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_cover_photo",metakey:metakey,user_id:user_id},success:function(e){t.hide()}})}),e(),jQuery("textarea[id=um-meta-bio]").change(e),jQuery("textarea[id=um-meta-bio]").keyup(e),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm("Are you sure that you want to delete this user?"))return!1})}); \ No newline at end of file diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js index 539411d7..0ae69160 100644 --- a/assets/js/um-scripts.js +++ b/assets/js/um-scripts.js @@ -278,9 +278,10 @@ jQuery(document).ready(function() { } jQuery.ajax({ - url: um_scripts.muted_action, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_muted_action', hook: hook, user_id: user_id, arguments: arguments @@ -329,15 +330,16 @@ jQuery(document).ready(function() { if( parent.val() != '' && typeof um_select_options_cache[ arr_key ] != 'object' ){ jQuery.ajax({ - url: um_scripts.ajax_select_options, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_select_options', parent_option_name: parent_option, parent_option: parent.val(), child_callback: um_ajax_source, child_name: me.attr('name'), members_directory: me.attr('data-mebers-directory'), - form_id: form_id, + form_id: form_id }, success: function( data ){ if( data.status == 'success' && parent.val() != '' ){ diff --git a/assets/js/um-scripts.min.js b/assets/js/um-scripts.min.js index 438aa51d..d9e00cc8 100644 --- a/assets/js/um-scripts.min.js +++ b/assets/js/um-scripts.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){jQuery(document).on("click",".um-dropdown a",function(e){return!1}),jQuery(document).on("click",".um-dropdown a.real_url",function(e){window.location=jQuery(this).attr("href")}),jQuery(document).on("click",".um-trigger-menu-on-click",function(e){return jQuery(".um-dropdown").hide(),menu=jQuery(this).find(".um-dropdown"),menu.show(),!1}),jQuery(document).on("click",".um-dropdown-hide",function(e){UM_hide_menus()}),jQuery(document).on("click","a.um-manual-trigger",function(){var e=jQuery(this).attr("data-child"),t=jQuery(this).attr("data-parent");jQuery(this).parents(t).find(e).trigger("click")}),jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}),jQuery(document).on("change",".um-field-area input[type=radio]",function(){var e=jQuery(this).parents(".um-field-area"),t=jQuery(this).parents("label");e.find(".um-field-radio").removeClass("active"),e.find(".um-field-radio").find("i").removeClass().addClass("um-icon-android-radio-button-off"),t.addClass("active"),t.find("i").removeClass().addClass("um-icon-android-radio-button-on")}),jQuery(document).on("change",".um-field-area input[type=checkbox]",function(){jQuery(this).parents(".um-field-area");var e=jQuery(this).parents("label");e.hasClass("active")?(e.removeClass("active"),e.find("i").removeClass().addClass("um-icon-android-checkbox-outline-blank")):(e.addClass("active"),e.find("i").removeClass().addClass("um-icon-android-checkbox-outline"))}),jQuery(".um-datepicker").each(function(){if(elem=jQuery(this),""!=elem.attr("data-disabled_weekdays"))var e=JSON.parse(elem.attr("data-disabled_weekdays"));else e=!1;var t=elem.attr("data-years"),a=elem.attr("data-date_min"),i=elem.attr("data-date_max"),r=a.split(","),n=i.split(","),u=r.length?new Date(r):null,d=r.length?new Date(n):null;if(u&&"Invalid Date"==u.toString()&&3==r.length){var o=r[1]+"/"+r[2]+"/"+r[0];u=new Date(Date.parse(o))}if(d&&"Invalid Date"==d.toString()&&3==n.length){var s=n[1]+"/"+n[2]+"/"+n[0];d=new Date(Date.parse(s))}elem.pickadate({selectYears:t,min:u,max:d,disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})}),jQuery(".um-timepicker").each(function(){elem=jQuery(this),elem.pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})}),jQuery(".um-rating").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,click:function(e,t){live_field=this.id,live_value=e,um_conditional()}}),jQuery(".um-rating-readonly").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,readOnly:!0}),jQuery(document).on("click",".um .um-single-image-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-image-preview img").attr("src");return t.find(".um-single-image-preview img").attr("src",""),t.find(".um-single-image-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:um_scripts.remove_file,type:"post",data:{src:a}}),!1}),jQuery(document).on("click",".um .um-single-file-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-fileinfo a").attr("href");return t.find(".um-single-file-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:um_scripts.remove_file,type:"post",data:{src:a}}),!1}),jQuery(".um-s1,.um-s2").css({display:"block"}),jQuery(".um-s1").select2({allowClear:!0}),jQuery(".um-s2").select2({allowClear:!1,minimumResultsForSearch:10}),jQuery(document).on("click",".um-field-group-head:not(.disabled)",function(){var e=jQuery(this).parents(".um-field-group"),t=e.data("max_entries");e.find(".um-field-group-body").is(":hidden")?e.find(".um-field-group-body").show():e.find(".um-field-group-body:first").clone().appendTo(e),increase_id=0,e.find(".um-field-group-body").each(function(){increase_id++,jQuery(this).find("input").each(function(){var e=jQuery(this);e.attr("id",e.data("key")+"-"+increase_id),e.attr("name",e.data("key")+"-"+increase_id),e.parent().parent().find("label").attr("for",e.data("key")+"-"+increase_id)})}),0builder(), 'dynamic_modal_content' ) ); + add_action( 'wp_ajax_um_populate_dropdown_options', array( UM()->builder(), 'populate_dropdown_options' ) ); + add_action( 'wp_ajax_um_update_field', array( UM()->builder(), 'update_field' ) ); + add_action( 'wp_ajax_um_do_ajax_action', array( UM()->fields(), 'do_ajax_action' ) ); + add_action( 'wp_ajax_um_update_builder', array( UM()->builder(), 'update_builder' ) ); + add_action( 'wp_ajax_um_update_order', array( UM()->dragdrop(), 'update_order' ) ); + add_action( 'wp_ajax_um_rated', array( UM()->admin_menu(), 'ultimatemember_rated' ) ); } diff --git a/includes/admin/core/class-admin-dragdrop.php b/includes/admin/core/class-admin-dragdrop.php index e8a25b9f..8c37b64a 100644 --- a/includes/admin/core/class-admin-dragdrop.php +++ b/includes/admin/core/class-admin-dragdrop.php @@ -216,6 +216,7 @@ if ( ! class_exists( 'um\admin\core\Admin_DragDrop' ) ) {
+
diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php index 1b8babc3..2b3b1e7a 100644 --- a/includes/admin/core/class-admin-enqueue.php +++ b/includes/admin/core/class-admin-enqueue.php @@ -174,14 +174,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { wp_register_style( 'um_admin_modal', $this->css_url . 'um-admin-modal.css' ); wp_enqueue_style( 'um_admin_modal' ); - wp_register_script( 'um_admin_modal', $this->js_url . 'um-admin-modal.js', '', '', true ); + wp_register_script( 'um_admin_modal', $this->js_url . 'um-admin-modal.js', array('jquery', 'wp-util'), '', true ); wp_enqueue_script( 'um_admin_modal' ); - - $localize_data = array( - 'ajax_url' => UM()->get_ajax_route( 'um\admin\core\Admin_Builder', 'dynamic_modal_content' ), - 'dropdown_ajax_url' => UM()->get_ajax_route( 'um\admin\core\Admin_Builder', 'populate_dropdown_options' ), - ); - wp_localize_script( 'um_admin_modal', 'um_admin_modal_data', $localize_data ); } @@ -189,14 +183,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { * Field Processing */ function load_field() { - wp_register_script( 'um_admin_field', $this->js_url . 'um-admin-field.js', '', '', true ); + wp_register_script( 'um_admin_field', $this->js_url . 'um-admin-field.js', array('jquery', 'wp-util'), '', true ); wp_enqueue_script( 'um_admin_field' ); - - $localize_data = array( - 'ajax_url' => UM()->get_ajax_route( 'um\admin\core\Admin_Builder', 'update_field' ), - 'do_ajax_url' => UM()->get_ajax_route( 'um\core\Fields', 'do_ajax_action' ), - ); - wp_localize_script( 'um_admin_field', 'um_admin_field_data', $localize_data ); } @@ -204,7 +192,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { * Load Builder */ function load_builder() { - wp_register_script( 'um_admin_builder', $this->js_url . 'um-admin-builder.js', '', '', true ); + wp_register_script( 'um_admin_builder', $this->js_url . 'um-admin-builder.js', array('jquery', 'wp-util'), '', true ); wp_enqueue_script( 'um_admin_builder' ); //hide footer text on add/edit UM Forms @@ -219,21 +207,14 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { } $localize_data = array( - 'ajax_url' => UM()->get_ajax_route( 'um\admin\core\Admin_Builder', 'update_builder' ), 'hide_footer' => $hide_footer, ); wp_localize_script( 'um_admin_builder', 'um_admin_builder_data', $localize_data ); - wp_register_script( 'um_admin_dragdrop', $this->js_url . 'um-admin-dragdrop.js', '', '', true ); + wp_register_script( 'um_admin_dragdrop', $this->js_url . 'um-admin-dragdrop.js', array('jquery', 'wp-util'), '', true ); wp_enqueue_script( 'um_admin_dragdrop' ); - $localize_data = array( - 'ajax_url' => UM()->get_ajax_route( 'um\admin\core\Admin_DragDrop', 'update_order' ), - ); - wp_localize_script( 'um_admin_dragdrop', 'um_admin_dragdrop_data', $localize_data ); - - wp_register_style( 'um_admin_builder', $this->css_url . 'um-admin-builder.css' ); wp_enqueue_style( 'um_admin_builder' ); } @@ -323,13 +304,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { * Load AJAX */ function load_ajax_js() { - wp_register_script( 'um_admin_ajax', $this->js_url . 'um-admin-ajax.js', '', '', true ); + wp_register_script( 'um_admin_ajax', $this->js_url . 'um-admin-ajax.js', array('jquery','wp-util'), '', true ); wp_enqueue_script( 'um_admin_ajax' ); - - $localize_data = array( - 'ajax_url' => UM()->get_ajax_route( 'um\core\Fields', 'do_ajax_action' ), - ); - wp_localize_script( 'um_admin_ajax', 'um_admin_ajax_data', $localize_data ); } diff --git a/includes/admin/core/class-admin-menu.php b/includes/admin/core/class-admin-menu.php index e590aa26..26bafe60 100644 --- a/includes/admin/core/class-admin-menu.php +++ b/includes/admin/core/class-admin-menu.php @@ -72,10 +72,16 @@ if ( ! class_exists( 'um\admin\core\Admin_Menu' ) ) { diff --git a/includes/admin/templates/modal/dynamic_edit_field.php b/includes/admin/templates/modal/dynamic_edit_field.php index 552ce855..daf838b4 100644 --- a/includes/admin/templates/modal/dynamic_edit_field.php +++ b/includes/admin/templates/modal/dynamic_edit_field.php @@ -10,6 +10,7 @@
+
diff --git a/includes/admin/templates/modal/dynamic_edit_row.php b/includes/admin/templates/modal/dynamic_edit_row.php index 5cb1704f..806c26ac 100644 --- a/includes/admin/templates/modal/dynamic_edit_row.php +++ b/includes/admin/templates/modal/dynamic_edit_row.php @@ -10,6 +10,7 @@
+
diff --git a/includes/admin/templates/modal/dynamic_new_divider.php b/includes/admin/templates/modal/dynamic_new_divider.php index 4919df9b..f9c9b10a 100644 --- a/includes/admin/templates/modal/dynamic_new_divider.php +++ b/includes/admin/templates/modal/dynamic_new_divider.php @@ -10,6 +10,7 @@
+
diff --git a/includes/admin/templates/modal/dynamic_new_field.php b/includes/admin/templates/modal/dynamic_new_field.php index 48474a94..9b3f64c6 100644 --- a/includes/admin/templates/modal/dynamic_new_field.php +++ b/includes/admin/templates/modal/dynamic_new_field.php @@ -10,6 +10,7 @@
+
diff --git a/includes/admin/templates/modal/dynamic_new_group.php b/includes/admin/templates/modal/dynamic_new_group.php index 3abd80aa..2f061007 100644 --- a/includes/admin/templates/modal/dynamic_new_group.php +++ b/includes/admin/templates/modal/dynamic_new_group.php @@ -10,6 +10,7 @@
+
diff --git a/includes/core/class-ajax-common.php b/includes/core/class-ajax-common.php index 2563d215..39c6367c 100644 --- a/includes/core/class-ajax-common.php +++ b/includes/core/class-ajax-common.php @@ -32,9 +32,10 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) { } + add_action( 'wp_ajax_um_select_options', array( UM()->form(), 'ajax_select_options' ) ); + add_action( 'wp_ajax_um_delete_profile_photo', array( UM()->profile(), 'ajax_delete_profile_photo' ) ); add_action( 'wp_ajax_um_delete_cover_photo', array( UM()->profile(), 'ajax_delete_cover_photo' ) ); - add_action( 'wp_ajax_um_select_options', array( UM()->form(), 'ajax_select_options' ) ); add_action( 'wp_ajax_um_ajax_paginate', array( UM()->query(), 'ajax_paginate' ) ); add_action( 'wp_ajax_um_muted_action', array( UM()->form(), 'ajax_muted_action' ) ); diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index f1a170d6..7678b5a5 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -115,35 +115,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { return; } - /** - * UM hook - * - * @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 - * - */ - $localize_data = apply_filters( 'um_enqueue_localize_data', array( - 'ajaxurl' => admin_url( 'admin-ajax.php' ), - 'muted_action' => UM()->get_ajax_route( 'um\core\Form', 'ajax_muted_action' ), - 'ajax_select_options' => UM()->get_ajax_route( 'um\core\Form', 'ajax_select_options' ), - ) ); - - $this->load_original(); - wp_localize_script( 'um_scripts', 'um_scripts', $localize_data ); // rtl style if ( is_rtl() ) { @@ -327,13 +299,13 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_script('um_conditional', um_url . 'assets/js/um-conditional' . $this->suffix . '.js' ); wp_enqueue_script('um_conditional'); - wp_register_script('um_scripts', um_url . 'assets/js/um-scripts' . $this->suffix . '.js' ); + wp_register_script('um_scripts', um_url . 'assets/js/um-scripts' . $this->suffix . '.js', array('jquery','wp-util') ); wp_enqueue_script('um_scripts'); wp_register_script('um_members', um_url . 'assets/js/um-members' . $this->suffix . '.js' ); wp_enqueue_script('um_members'); - wp_register_script('um_profile', um_url . 'assets/js/um-profile' . $this->suffix . '.js' ); + wp_register_script('um_profile', um_url . 'assets/js/um-profile' . $this->suffix . '.js', array('jquery','wp-util') ); wp_enqueue_script('um_profile'); wp_register_script('um_account', um_url . 'assets/js/um-account' . $this->suffix . '.js' ); @@ -446,7 +418,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_style('um_modal', um_url . 'assets/css/um-modal.css' ); wp_enqueue_style('um_modal'); - wp_register_script('um_modal', um_url . 'assets/js/um-modal' . $this->suffix . '.js' ); + wp_register_script('um_modal', um_url . 'assets/js/um-modal' . $this->suffix . '.js', array('jquery','wp-util') ); wp_enqueue_script('um_modal'); }