- wp native ajax fix

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('<img src="'+e.data.image.source_url+"?"+d.getTime()+'" alt="" />'),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("input[type=hidden][name='user_id']").length&&jQuery("#"+a).attr("data-user_id",jQuery("input[type=hidden][name='user_id']").val())),um_new_modal(a,t)})});
+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:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",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:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",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:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_resize_image",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('<img src="'+e.data.image.source_url+"?"+d.getTime()+'" alt="" />'),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("input[type=hidden][name='user_id']").length&&jQuery("#"+a).attr("data-user_id",jQuery("input[type=hidden][name='user_id']").val())),um_new_modal(a,t)})});

assets/js/um-profile.min.js

@@ -1 +1 @@
-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:um_scripts.delete_profile_photo,type:"post",data:{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('<a href="#" class="um-cover-add um-manual-trigger" data-parent=".um-cover" data-child=".um-btn-auto-width"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" title="Upload a cover photo"></i></span></a>'),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})});
+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('<a href="#" class="um-cover-add um-manual-trigger" data-parent=".um-cover" data-child=".um-btn-auto-width"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" title="Upload a cover photo"></i></span></a>'),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})});

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() != '' ){

includes/admin/assets/js/um-admin-ajax.js

@@ -29,9 +29,9 @@ jQuery(document).ready(function() {
 				
 		um_admin_remove_modal();
 		jQuery.ajax({
-			url: um_admin_ajax_data.ajax_url,
+			url: wp.ajax.settings.url,
 			type: 'POST',
-			data: { act_id : act_id, arg1 : arg1, arg2 : arg2, in_row: in_row, in_sub_row: in_sub_row, in_column: in_column, in_group: in_group },
+			data: { action:'um_do_ajax_action',act_id : act_id, arg1 : arg1, arg2 : arg2, in_row: in_row, in_sub_row: in_sub_row, in_column: in_column, in_group: in_group },
 			success: function(data){
 				
 				jQuery('.um-col-demon-settings').data('in_row', '');

includes/admin/assets/js/um-admin-builder.js

@@ -10,9 +10,10 @@ function um_admin_update_builder() {
 	jQuery('.tipsy').hide();
 
 	jQuery.ajax({
-		url: um_admin_builder_data.ajax_url,
+		url: wp.ajax.settings.url,
 		type: 'POST',
 		data: {
+			action:'um_update_builder',
 			form_id: form_id
 		},
 		success: function(data){

includes/admin/assets/js/um-admin-dragdrop.js

@@ -244,7 +244,7 @@ function UM_Rows_Refresh(){
 	UM_Add_Icon();
 	
 	jQuery.ajax({
-		url: um_admin_dragdrop_data.ajax_url,
+		url: wp.ajax.settings.url,
 		type: 'POST',
 		data: jQuery( '.um_update_order' ).serialize(),
 		success: function(){

includes/admin/assets/js/um-admin-field.js

@@ -11,9 +11,9 @@ jQuery(document).ready(function() {
 			arg1 = jQuery(this).parents('a').data('arg1');
 
 			jQuery.ajax({
-				url: um_admin_field_data.do_ajax_url,
+				url: wp.ajax.settings.url,
 				type: 'POST',
-				data: {act_id : 'um_admin_remove_field_global', arg1 : arg1 },
+				data: {action:'um_do_ajax_action',act_id : 'um_admin_remove_field_global', arg1 : arg1 },
 				success: function(data){
 					
 				},
@@ -59,7 +59,7 @@ jQuery(document).ready(function() {
 		var form = jQuery(this);
 
 		jQuery.ajax({
-			url: um_admin_field_data.ajax_url,
+			url: wp.ajax.settings.url,
 			type: 'POST',
 			dataType: 'json',
 			data: form.serialize(),

includes/admin/assets/js/um-admin-modal.js

@@ -51,9 +51,9 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
 	}
 	
 	jQuery.ajax({
-		url: um_admin_modal_data.ajax_url,
+		url: wp.ajax.settings.url,
 		type: 'POST',
-		data: {act_id: act_id, arg1 : arg1, arg2 : arg2, arg3: arg3, in_row: in_row, in_sub_row: in_sub_row, in_column: in_column, in_group: in_group },
+		data: { action:'um_dynamic_modal_content',act_id: act_id, arg1 : arg1, arg2 : arg2, arg3: arg3, in_row: in_row, in_sub_row: in_sub_row, in_column: in_column, in_group: in_group },
 		complete: function(){
 			um_admin_modal_loaded();
 			um_admin_modal_responsive();
@@ -383,9 +383,9 @@ jQuery(document).ready(function() {
         if( me.val() != '' ){
         	var um_option_callback = me.val();
           	jQuery.ajax({
-				url: um_admin_modal_data.dropdown_ajax_url,
+				url: wp.ajax.settings.url,
 				type: 'POST',
-				data: { um_option_callback: um_option_callback },
+				data: { action:'populate_dropdown_options',um_option_callback: um_option_callback },
 				complete: function(){
 					
 				},

includes/admin/class-admin.php

@@ -46,6 +46,16 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
 			add_action( 'parent_file', array( &$this, 'parent_file' ), 9 );
 			add_filter( 'gettext', array( &$this, 'gettext' ), 10, 4 );
 			add_filter( 'post_updated_messages', array( &$this, 'post_updated_messages' ) );
+
+
+
+			add_action( 'wp_ajax_um_dynamic_modal_content', array( UM()->builder(), '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' ) );
 		}
 
 

includes/admin/core/class-admin-dragdrop.php

@@ -216,6 +216,7 @@ if ( ! class_exists( 'um\admin\core\Admin_DragDrop' ) ) {
 			<form action="" method="post" class="um_update_order">
 
 				<input type="hidden" name="form_id" id="form_id" value="<?php echo get_the_ID(); ?>" />
+				<input type="hidden" name="action" value="um_update_order" />
 
 				<div class="um_update_order_fields">
 

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 );
 		}
 
 

includes/admin/core/class-admin-menu.php

@@ -72,10 +72,16 @@ if ( ! class_exists( 'um\admin\core\Admin_Menu' ) ) {
 
 					<script type="text/javascript">
 						jQuery( 'a.um-admin-rating-link' ).click(function() {
-							jQuery.post(
-								'<?php echo UM()->get_ajax_route( get_class( $this ), 'ultimatemember_rated' ) ?>',
-								{}
-							);
+							jQuery.ajax({
+								url: wp.ajax.settings.url,
+								type: 'post',
+								data: {
+									action: 'um_rated'
+								},
+								success: function(){
+
+								}
+							});
 							jQuery(this).parent().text( jQuery( this ).data( 'rated' ) );
 						});
 					</script>

includes/admin/templates/modal/dynamic_edit_field.php

@@ -10,6 +10,7 @@
 
 		<div class="um-admin-modal-foot">
 			<input type="submit" value="<?php _e('Update','ultimate-member'); ?>" class="button-primary" />
+			<input type="hidden" name="action" value="um_update_field" />
 			<a href="#" data-action="UM_remove_modal" class="button"><?php _e('Cancel','ultimate-member'); ?></a>
 		</div>
 	

includes/admin/templates/modal/dynamic_edit_row.php

@@ -10,6 +10,7 @@
 
 		<div class="um-admin-modal-foot">
 			<input type="submit" value="<?php _e('Update','ultimate-member'); ?>" class="button-primary" />
+			<input type="hidden" name="action" value="um_update_field" />
 			<a href="#" data-action="UM_remove_modal" class="button"><?php _e('Cancel','ultimate-member'); ?></a>
 		</div>
 	

includes/admin/templates/modal/dynamic_new_divider.php

@@ -10,6 +10,7 @@
 
 		<div class="um-admin-modal-foot">
 			<input type="submit" value="<?php _e('Add','ultimate-member'); ?>" class="button-primary" />
+			<input type="hidden" name="action" value="um_update_field" />
 			<a href="#" data-action="UM_remove_modal" class="button"><?php _e('Cancel','ultimate-member'); ?></a>
 		</div>
 	

includes/admin/templates/modal/dynamic_new_field.php

@@ -10,6 +10,7 @@
 
 		<div class="um-admin-modal-foot">
 			<input type="submit" value="<?php _e('Add','ultimate-member'); ?>" class="button-primary" />
+			<input type="hidden" name="action" value="um_update_field" />
 			<a href="#" data-modal="UM_fields" class="button"><?php _e('Cancel','ultimate-member'); ?></a>
 		</div>
 	

includes/admin/templates/modal/dynamic_new_group.php

@@ -10,6 +10,7 @@
 
 		<div class="um-admin-modal-foot">
 			<input type="submit" value="<?php _e('Add','ultimate-member'); ?>" class="button-primary" />
+			<input type="hidden" name="action" value="um_update_field" />
 			<a href="#" data-action="UM_remove_modal" class="button"><?php _e('Cancel','ultimate-member'); ?></a>
 		</div>
 	

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' ) );
 

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
-			 * <?php
-			 * add_filter( 'um_enqueue_localize_data', 'my_enqueue_localize_data', 10, 1 );
-			 * function my_enqueue_localize_data( $data ) {
-			 *     // your code here
-			 *     return $data;
-			 * }
-			 * ?>
-			 */
-			$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');
 
 		}