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

- fixed pagination displaying on history browser action;

Browse Source 
- added classes to separate handlers and avoid conflicts with Groups extension;
This commit is contained in:
nikitasinelnikov
2019-11-07 11:28:23 +02:00
parent e01dbfe0a9
commit e72c4f343d
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-members.js
+24 -15
View File
@@ -497,7 +497,7 @@ function um_run_search( directory ) {
jQuery(document.body).ready( function() {
jQuery( '.um-search-filter select' ).each( function() {
jQuery( '.um-directory .um-search-filter select' ).each( function() {
if ( jQuery(this).find('option:not(:disabled)').length === 1 ) {
jQuery(this).prop('disabled', true);
}
@@ -510,7 +510,7 @@ jQuery(document.body).ready( function() {
//UI for change view type button
jQuery( document.body ).on( 'mouseover', '.um-member-directory-view-type', function() {
jQuery( document.body ).on( 'mouseover', '.um-directory .um-member-directory-view-type', function() {
if ( jQuery(this).hasClass('um-disabled') ) {
return;
}
@@ -524,7 +524,7 @@ jQuery(document.body).ready( function() {
} else {
jQuery(this).find( '.um-member-directory-view-type-a:first' ).show().tipsy('show');
}
}).on( 'mouseout', '.um-member-directory-view-type', function() {
}).on( 'mouseout', '.um-directory .um-member-directory-view-type', function() {
if ( jQuery(this).hasClass('um-disabled') ) {
return;
}
@@ -534,7 +534,7 @@ jQuery(document.body).ready( function() {
});
//change layout handler
jQuery( document.body ).on( 'click', '.um-member-directory-view-type-a', function() {
jQuery( document.body ).on( 'click', '.um-directory .um-member-directory-view-type-a', function() {
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
return false;
@@ -583,14 +583,14 @@ jQuery(document.body).ready( function() {
//searching
jQuery( document.body ).on( 'click', '.um-do-search', function() {
jQuery( document.body ).on( 'click', '.um-directory .um-do-search', function() {
var directory = jQuery(this).parents('.um-directory');
um_run_search( directory );
});
//make search on Enter click
jQuery( document.body ).on( 'keypress', '.um-search-line', function(e) {
jQuery( document.body ).on( 'keypress', '.um-directory .um-search-line', function(e) {
if ( e.which === 13 ) {
var directory = jQuery(this).parents('.um-directory');
um_run_search( directory );
@@ -608,7 +608,7 @@ jQuery(document.body).ready( function() {
* Sorting
*/
jQuery( document.body ).on( 'click', '.um-member-directory-sorting-a .um-new-dropdown li a', function() {
jQuery( document.body ).on( 'click', '.um-directory .um-member-directory-sorting-a .um-new-dropdown li a', function() {
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
@@ -729,7 +729,7 @@ jQuery(document.body).ready( function() {
* Profile Cards actions
*/
jQuery( document.body ).on('click', '.um-members.um-members-list .um-member-more a', function(e){
jQuery( document.body ).on('click', '.um-directory .um-members.um-members-list .um-member-more a', function(e){
e.preventDefault();
var block = jQuery(this).parents('.um-member');
@@ -741,7 +741,7 @@ jQuery(document.body).ready( function() {
return false;
});
jQuery( document.body ).on('click', '.um-members.um-members-list .um-member-less a', function(e){
jQuery( document.body ).on('click', '.um-directory .um-members.um-members-list .um-member-less a', function(e){
e.preventDefault();
var block = jQuery(this).parents('.um-member');
@@ -754,7 +754,7 @@ jQuery(document.body).ready( function() {
});
jQuery( document.body ).on('click', '.um-members.um-members-grid .um-member-more a', function(e){
jQuery( document.body ).on('click', '.um-directory .um-members.um-members-grid .um-member-more a', function(e){
e.preventDefault();
var block = jQuery(this).parents('.um-member');
@@ -768,7 +768,7 @@ jQuery(document.body).ready( function() {
return false;
});
jQuery( document.body ).on('click', '.um-members.um-members-grid .um-member-less a', function(e){
jQuery( document.body ).on('click', '.um-directory .um-members.um-members-grid .um-member-less a', function(e){
e.preventDefault();
var block = jQuery(this).parents('.um-member');
@@ -812,7 +812,7 @@ jQuery(document.body).ready( function() {
//filtration process
jQuery( document.body ).on( 'change', '.um-search-filter select', function() {
jQuery( document.body ).on( 'change', '.um-directory .um-search-filter select', function() {
if ( jQuery(this).val() === '' ) {
return;
}
@@ -864,10 +864,10 @@ jQuery(document.body).ready( function() {
});
jQuery( document.body ).on( 'click', '.um-members-filter-remove', function() {
jQuery( document.body ).on( 'click', '.um-directory .um-members-filter-remove', function() {
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
if ( um_is_directory_busy( directory ) || ! directory ) {
return;
}
@@ -953,7 +953,7 @@ jQuery(document.body).ready( function() {
});
jQuery( document.body ).on( 'click', '.um-clear-filters-a', function() {
jQuery( document.body ).on( 'click', '.um-directory .um-clear-filters-a', function() {
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
return;
@@ -1313,6 +1313,15 @@ jQuery(document.body).ready( function() {
directory.find('.um-search-line').val( search );
}
var page = um_get_data_for_directory( directory, 'page' );
if ( typeof page == 'undefined' ) {
page = 1;
} else if ( page > directory.data( 'total_pages' ) ) {
page = directory.data( 'total_pages' );
}
directory.data( 'page', page ).attr( 'data-page', page );
//sorting from history
if ( directory.find( '.um-member-directory-sorting' ).length ) {
var sort = um_get_data_for_directory( directory, 'sort' );
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
languages/ultimate-member-en_US.po
+8 -8
View File
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2019-10-25 01:04+0300\n"
"PO-Revision-Date: 2019-10-25 01:04+0300\n"
"POT-Creation-Date: 2019-11-07 11:27+0200\n"
"PO-Revision-Date: 2019-11-07 11:27+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
@@ -4577,7 +4577,7 @@ msgid "Register"
msgstr ""
#: includes/class-config.php:135 includes/class-config.php:788
#: includes/core/class-member-directory.php:1855
#: includes/core/class-member-directory.php:1844
#: includes/core/um-actions-profile.php:1233
#: includes/core/um-actions-user.php:19
msgid "Logout"
@@ -7126,14 +7126,14 @@ msgstr ""
msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old"
msgstr ""
#: includes/core/class-member-directory.php:1800
#: includes/core/class-member-directory.php:1844
#: includes/core/class-member-directory.php:1789
#: includes/core/class-member-directory.php:1833
#: includes/core/um-actions-profile.php:1200
#: includes/core/um-actions-profile.php:1231
msgid "Edit Profile"
msgstr ""
#: includes/core/class-member-directory.php:1850
#: includes/core/class-member-directory.php:1839
#: includes/core/um-actions-profile.php:1232
msgid "My Account"
msgstr ""
@@ -7184,7 +7184,7 @@ msgid "This activation link is expired or have already been used."
msgstr ""
#. translators: %s: support forums URL
#: includes/core/class-plugin-updater.php:280
#: includes/core/class-plugin-updater.php:283
#, php-format
msgid ""
"An unexpected error occurred. Something may be wrong with %s or this "
@@ -7192,7 +7192,7 @@ msgid ""
"the <a href=\"%s\">support forums</a>."
msgstr ""
#: includes/core/class-plugin-updater.php:282
#: includes/core/class-plugin-updater.php:285
msgid "https://wordpress.org/support/"
msgstr ""