Merge branch 'beta/2.1.0' of https://github.com/ultimatemember/ultimatemember into beta/2.1.0

This commit is contained in:
nikitasinelnikov
2019-09-05 13:51:44 +03:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -216,14 +216,14 @@ function um_ajax_get_members( directory, args ) {
um_build_template( directory, answer.users );
um_members_hide_preloader( directory );
var pagination_template = wp.template( 'um-members-pagination' );
directory.find('.um-members-pagination-box').html( pagination_template( answer ) );
directory.data( 'total_pages', answer.pagination.total_pages );
jQuery( document ).trigger('um_members_rendered');
um_members_hide_preloader( directory );
},
error: function( data ) {
console.log( data );
+2 -2
View File
@@ -130,7 +130,7 @@ if( $args['must_search'] == 1 ) {
data-hash="<?php echo esc_attr( substr( md5( $form_id ), 10, 5 ) ) ?>" data-base-post="<?php echo esc_attr( $post->ID ) ?>"
data-show="<?php echo esc_attr( $after_search ); ?>"
data-view_type="<?php echo esc_attr( $current_view ) ?>" data-page="<?php echo esc_attr( $current_page ) ?>">
<div class="um-members-overlay"><div class="um-ajax-loading"></div></div>
<div class="um-form">
<div class="um-member-directory-header <?php echo esc_attr( $classes ) ?>">
@@ -243,7 +243,7 @@ if( $args['must_search'] == 1 ) {
?>
<div class="um-members-wrapper">
<div class="um-members-overlay"><div class="um-ajax-loading"></div></div>
</div>
<div class="um-clear"></div>