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

Merge pull request #731 from ultimatemember/fix/dropdown_menu_position

Browse Source 
Fix problems with the positioning of the dropdown menu
This commit is contained in:
Nikita Sinelnikov
2021-03-04 17:05:50 +02:00
committed by GitHub
parent 2499bbfa00 69efeb7385
commit 15f8b26b51
7 changed files with 202 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-styles.css
+1 -1
View File
@@ -744,7 +744,7 @@ a.um-link-alt:hover {text-decoration: underline !important;}
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
z-index: 10;
z-index: 55;
display: none;
border: 1px solid #e5e5e5;
box-sizing: border-box;
assets/js/um-functions.js
+193 -118
View File
@@ -1,3 +1,193 @@
/*
Plugin Name: Ultimate Member
Description: Frontend scripts
Version: 2.1.16
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
if ( typeof (window.UM) !== 'object' ) {
window.UM = {};
}
UM.dropdown = {
/**
* Hide the menu
* @param {object} menu
* @returns {undefined}
*/
hide: function (menu) {
var $menu = jQuery(menu);
$menu.parents('div').find('a').removeClass('active');
$menu.hide();
},
/**
* Hide all menus
* @returns {undefined}
*/
hideAll: function () {
var $menu = jQuery('.um-dropdown');
$menu.parents('div').find('a').removeClass('active');
$menu.hide();
},
/**
* Update the menu position
* @param {object} menu
* @returns {undefined}
*/
setPosition: function (menu) {
var $menu = jQuery(menu),
menu_width = 200;
var direction = jQuery('html').attr('dir'),
element = $menu.attr('data-element'),
position = $menu.attr('data-position'),
trigger = $menu.attr('data-trigger');
var $element = element && jQuery(element).length ? jQuery(element) : ($menu.siblings('a').length ? $menu.siblings('a').first() : $menu.parent());
$element.addClass('um-trigger-menu-on-' + trigger);
var gap_right = 0,
left_p = ($element.outerWidth() - menu_width) / 2,
top_p = $element.outerHeight(),
coord = $element.offset();
// profile photo
if ( $element.is('.um-profile-photo') ) {
var $imgBox = $element.find('.um-profile-photo-img');
if ( $element.closest('div.uimob500').length ) {
top_p = $element.outerHeight() - $imgBox.outerHeight() / 4;
} else {
left_p = ($imgBox.outerWidth() - menu_width) / 2;
top_p = $imgBox.outerHeight() / 4;
}
}
// cover photo
if ( $element.is('.um-cover') ) {
var $imgBox = $element.find('.um-cover-e');
if ( $element.closest('div.uimob500').length ) {
left_p = ($imgBox.outerWidth() - menu_width) / 2;
top_p = $imgBox.outerHeight() / 2 + 24;
} else {
left_p = ($imgBox.outerWidth() - menu_width) / 2;
top_p = $imgBox.outerHeight() / 2 + 46;
}
}
// position
if ( position === 'lc' && direction === 'rtl' ) {
position = 'rc';
}
if( $element.outerWidth() < menu_width ){
if ( direction === 'rtl' && coord.left < menu_width*0.5 ){
position = 'rc';
} else if ( direction !== 'rtl' && (window.innerWidth - coord.left - $element.outerWidth()) < menu_width*0.5 ){
position = 'lc';
}
}
switch ( position ) {
case 'lc':
gap_right = $element.width() + 17;
$menu.css({
'top': 0,
'width': menu_width,
'left': 'auto',
'right': gap_right + 'px',
'text-align': 'center'
});
$menu.find('.um-dropdown-arr').css({
'top': '4px',
'left': 'auto',
'right': '-17px'
}).find('i').removeClass().addClass('um-icon-arrow-right-b');
break;
case 'rc':
gap_right = $element.width() + 25;
$menu.css({
'top': 0,
'width': menu_width,
'left': gap_right + 'px',
'right': 'auto',
'text-align': 'center'
});
$menu.find('.um-dropdown-arr').css({
'top': '4px',
'left': '-17px',
'right': 'auto'
}).find('i').removeClass().addClass('um-icon-arrow-left-b');
break;
case 'bc':
default:
var top_offset = $menu.data('top-offset');
if ( typeof top_offset !== 'undefined' ) {
top_p += top_offset;
}
$menu.css({
'top': top_p + 6,
'width': menu_width,
'left': left_p,
'right': 'auto',
'text-align': 'center'
});
$menu.find('.um-dropdown-arr').css({
'top': '-17px',
'left': ($menu.width() / 2) - 12,
'right': 'auto'
}).find('i').removeClass().addClass('um-icon-arrow-up-b');
break;
}
},
/**
* Show the menu
* @param {object} menu
* @returns {undefined}
*/
show: function (menu) {
var $menu = jQuery(menu);
UM.dropdown.hideAll();
UM.dropdown.setPosition($menu);
$menu.show();
}
};
/**
* Hide all menus
* @deprecated since 2.1.16, use UM.dropdown.hideAll() instead
* @returns {undefined}
*/
function UM_hide_menus() {
UM.dropdown.hideAll();
}
/**
* Update menu position
*/
function UM_domenus() {
jQuery('.um-dropdown').each( function( i, menu ) {
UM.dropdown.setPosition( menu );
});
}
function UM_check_password_matched() {
jQuery(document).on('keyup', 'input[data-key=user_password],input[data-key=confirm_user_password]', function(e) {
@@ -15,121 +205,6 @@ function UM_check_password_matched() {
});
}
function UM_hide_menus() {
var menu = jQuery( '.um-dropdown' );
menu.parents('div' ).find('a').removeClass( 'active' );
menu.hide();
}
function UM_domenus() {
jQuery('.um-dropdown').each( function() {
var menu = jQuery(this);
var element = jQuery(this).attr('data-element');
var position = jQuery(this).attr('data-position');
jQuery( element ).addClass('um-trigger-menu-on-' + menu.attr( 'data-trigger' ) );
if ( position === 'lc' && jQuery('html').attr('dir') === 'rtl' ){
position = 'rc';
}
if ( jQuery(window).width() <= 1200 && element === 'div.um-profile-edit' ) {
if ( jQuery('html').attr('dir') === 'rtl' ){
position = 'rc';
} else {
position = 'lc';
}
}
if ( 200 > jQuery(element).find('img').width() ) {
left_p = ( ( jQuery(element).width() - jQuery(element).find('img').width() ) / 2 ) + ( ( jQuery(element).find('img').width() - 200 ) / 2 );
} else {
left_p = ( ( jQuery(element).width() - jQuery(element).find('img').width() ) / 2 );
}
top_ = parseInt( jQuery(element).find('a').css('top') );
if ( top_ ) {
top_p = jQuery(element).find('img').height() + 4 + top_;
} else {
top_p = jQuery(element).find('img').height() + 4;
}
if ( top_p == 4 && element === 'div.um-cover' ) {
top_p = jQuery(element).height() / 2 + ( menu.height() / 2 );
} else if ( top_p == 4 ) {
top_p = jQuery(element).height() + 20;
}
if ( position === 'lc' ) {
gap_right = jQuery(element).width() + 17;
menu.css({
'top' : 0,
'width': 200,
'left': 'auto',
'right' : gap_right + 'px',
'text-align' : 'center'
});
menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-right-b');
menu.find('.um-dropdown-arr').css({
'top' : '4px',
'left' : 'auto',
'right' : '-17px'
});
} else if ( position === 'rc' ) {
gap_right = jQuery(element).width() + 25;
menu.css({
'top' : 0,
'width': 200,
'left': gap_right + 'px',
'right' : 'auto',
'text-align' : 'center'
});
menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-left-b');
menu.find('.um-dropdown-arr').css({
'top' : '4px',
'left' : '-17px',
'right' : 'auto'
});
} else if ( position === 'bc' ) {
var top_o = 0;
var top_offset = menu.data('top-offset');
if ( typeof top_offset !== 'undefined' ) {
top_o = top_offset*1;
}
menu.css({
'top' : top_p + top_o,
'width': 200,
'left': left_p,
'right' : 'auto',
'text-align' : 'center'
});
menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-up-b');
menu.find('.um-dropdown-arr').css({
'top' : '-17px',
'left' : ( menu.width() / 2 ) - 12,
'right' : 'auto'
});
}
});
}
function um_responsive(){
@@ -524,7 +599,7 @@ function um_new_modal( id, size, isPhoto, source ){
jQuery('.tipsy').hide();
UM_hide_menus();
UM.dropdown.hideAll();
jQuery('body,html,textarea').css("overflow", "hidden");
@@ -676,13 +751,13 @@ function um_remove_modal() {
}
function um_modal_size( aclass ) {
jQuery('.um-modal:visible').addClass(aclass);
}
function um_modal_add_attr( id, value ) {
jQuery('.um-modal:visible').data( id, value );
}
assets/js/um-functions.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/js/um-profile.js
+2 -2
View File
@@ -41,7 +41,7 @@ jQuery(document).ready(function() {
user_id = jQuery(this).attr('data-user_id');
metakey = 'profile_photo';
UM_hide_menus();
UM.dropdown.hideAll();
jQuery.ajax({
url: wp.ajax.settings.url,
@@ -84,7 +84,7 @@ jQuery(document).ready(function() {
}
});
UM_hide_menus();
UM.dropdown.hideAll();
return false;
});
assets/js/um-profile.min.js
Vendored
+1 -1
View File
@@ -1 +1 @@
jQuery(document).ready(function(){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-profile.um-viewing .um-profile-body").find(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document.body).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um").find("form").submit(),!1}),jQuery(document.body).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document.body).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){e.preventDefault()}),jQuery(document.body).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.body).on("click",".um-reset-profile-photo",function(e){return 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",UM_hide_menus(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html('<a href="javascript:void(0);" class="um-cover-add" style="height: 370px;"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" original-title="Upload a cover photo"></i></span></a>'),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,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM_hide_menus(),!1}),jQuery(document.body).on("change, keyup",'textarea[id="um-meta-bio"]',function(){if(void 0!==jQuery(this).val()){var e=jQuery(this).attr("data-character-limit")-jQuery(this).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('textarea[id="um-meta-bio"]').trigger("change"),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm(wp.i18n.__("Are you sure that you want to delete this user?","ultimate-member")))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){e.currentTarget.click()})});
jQuery(document).ready(function(){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-profile.um-viewing .um-profile-body").find(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document.body).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um").find("form").submit(),!1}),jQuery(document.body).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document.body).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){e.preventDefault()}),jQuery(document.body).on("click",".um-photo-modal",function(e){e.preventDefault();e=jQuery(this).attr("data-src");return um_new_modal("um_view_photo","fit",!0,e),!1}),jQuery(document.body).on("click",".um-reset-profile-photo",function(e){return 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",UM.menus.hideAll(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html('<a href="javascript:void(0);" class="um-cover-add" style="height: 370px;"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" original-title="Upload a cover photo"></i></span></a>'),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,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM.menus.hideAll(),!1}),jQuery(document.body).on("change, keyup",'textarea[id="um-meta-bio"]',function(){var e;void 0!==jQuery(this).val()&&(e=jQuery(this).attr("data-character-limit")-jQuery(this).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('textarea[id="um-meta-bio"]').trigger("change"),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm(wp.i18n.__("Are you sure that you want to delete this user?","ultimate-member")))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){e.currentTarget.click()})});
assets/js/um-scripts.js
+3 -4
View File
@@ -94,14 +94,13 @@ jQuery(document).ready(function() {
});
jQuery( document.body ).on( 'click', '.um-trigger-menu-on-click', function() {
jQuery('.um-dropdown').hide();
var menu = jQuery(this).find('.um-dropdown');
menu.show();
UM.dropdown.show( menu );
return false;
});
jQuery( document.body ).on('click', '.um-dropdown-hide', function() {
UM_hide_menus();
UM.dropdown.hideAll();
return false;
});
@@ -109,7 +108,7 @@ jQuery(document).ready(function() {
var child = jQuery(this).attr('data-child');
var parent = jQuery(this).attr('data-parent');
jQuery(this).parents( parent ).find( child ).trigger('click');
UM_hide_menus();
UM.dropdown.hideAll();
return false;
});
assets/js/um-scripts.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long