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

- wp native ajax fix

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-08-15 13:24:22 +03:00
parent a6aef845b8
commit 6e0836a4f8
20 changed files with 56 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-ajax.js
+2 -2
View File
@@ -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
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+4 -4
View File
@@ -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
+10
View File
@@ -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
+1
View File
@@ -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
+5 -29
View File
@@ -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
+10 -4
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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>