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

- added integration with Profile Tabs;

Browse Source 
- added ignore show after search/filtering option via JS hook (fixed User Tags);
This commit is contained in:
nikitasinelnikov
2019-12-10 17:50:56 +02:00
parent 4c437240f7
commit ba96d28b50
3 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-members.js
+71 -46
View File
@@ -559,16 +559,22 @@ function um_run_search( directory ) {
directory.data( 'page', 1 );
um_set_url_from_data( directory, 'page', '' );
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
var ignore_after_search = false;
ignore_after_search = wp.hooks.applyFilters( 'um_member_directory_ignore_after_search', ignore_after_search );
if ( ! ignore_after_search ) {
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
}
}
}
@@ -1108,16 +1114,21 @@ jQuery(document.body).ready( function() {
directory.find('.um-clear-filters').show();
}
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
var ignore_after_search = false;
ignore_after_search = wp.hooks.applyFilters( 'um_member_directory_ignore_after_search', ignore_after_search );
if ( ! ignore_after_search ) {
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( directory.find( '.um-members-filter-remove' ).length === 0 && ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
}
}
}
@@ -1211,16 +1222,21 @@ jQuery(document.body).ready( function() {
directory.find('.um-clear-filters').parents('.um-member-directory-header-row').removeClass( 'um-header-row-invisible' );
}
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
var ignore_after_search = false;
ignore_after_search = wp.hooks.applyFilters( 'um_member_directory_ignore_after_search', ignore_after_search );
if ( ! ignore_after_search ) {
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
if ( ! search ) {
directory.data( 'searched', 0 );
directory.find('.um-members-grid, .um-members-list').remove();
directory.find( '.um-member-directory-sorting-options' ).prop( 'disabled', true );
directory.find( '.um-member-directory-view-type' ).addClass( 'um-disabled' );
um_members_hide_preloader( directory );
return;
}
}
}
@@ -1486,12 +1502,17 @@ jQuery(document.body).ready( function() {
});
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
return;
var ignore_after_search = false;
ignore_after_search = wp.hooks.applyFilters( 'um_member_directory_ignore_after_search', ignore_after_search );
if ( ! ignore_after_search ) {
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
return;
}
}
}
@@ -1611,17 +1632,21 @@ jQuery(document.body).ready( function() {
}
});
var ignore_after_search = false;
ignore_after_search = wp.hooks.applyFilters( 'um_member_directory_ignore_after_search', ignore_after_search );
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
directory.data( 'searched', 0 );
um_members_hide_preloader( directory );
return;
} else {
directory.data( 'searched', 1 );
if ( ! ignore_after_search ) {
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
var filters_data = um_get_filters_data( directory );
if ( ! filters_data.length && ! search ) {
directory.data( 'searched', 0 );
um_members_hide_preloader( directory );
return;
} else {
directory.data( 'searched', 1 );
}
}
}
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
includes/admin/assets/js/um-admin-modal.js
+2 -2
View File
@@ -387,13 +387,13 @@ jQuery(document).ready(function() {
jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){
var v_id = '';
var icon_selected = jQuery(this).attr('data-code');
if (icon_selected != ''){
if ( icon_selected != '' ) {
if ( jQuery(this).attr('data-modal') ) {
v_id = '#' + jQuery(this).attr('data-modal');
} else {
v_id = '.postbox';
}
jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon').val( icon_selected );
jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( icon_selected );
jQuery( v_id ).find('span.um-admin-icon-value').html('<i class="'+icon_selected+'"></i>');
jQuery( v_id ).find('.um-admin-icon-clear').show();
}