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

- fixed select2 dropdown window position;

Browse Source
This commit is contained in:
nikitasinelnikov
2021-03-10 02:52:52 +02:00
parent ebebcbf974
commit c6f1ba0a6f
9 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-account.css
+8
View File
@@ -37,6 +37,14 @@
display: none;
}
.um-account-tab .um-field .um-field-label {
display: flex;
flex-direction: row;
align-items: baseline;
flex-wrap: nowrap;
justify-content: flex-start;
}
/*
- Main tab
*/
assets/css/um-members.css
+2 -1
View File
@@ -279,7 +279,8 @@ body #content .um-directory a {
justify-content: flex-start;
align-items: baseline;
flex-wrap: nowrap;
width: 100%; }
width: 100%;
position: relative; }
.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter .select2-container {
float: left;
width: 100% !important; }
assets/js/um-members.js
+17 -5
View File
@@ -635,7 +635,11 @@ jQuery(document.body).ready( function() {
if ( jQuery(this).find('option:not(:disabled)').length === 1 ) {
jQuery(this).prop('disabled', true);
}
jQuery(this).select2('destroy').select2();
var obj = jQuery(this);
obj.select2('destroy').select2({
dropdownParent: obj.parent()
});
});
/**
@@ -988,8 +992,11 @@ jQuery(document.body).ready( function() {
jQuery(this).prop('disabled', true);
}
jQuery(this).select2('destroy').select2();
jQuery(this).val('').trigger( 'change' );
var obj = jQuery(this);
obj.select2('destroy').select2({
dropdownParent: obj.parent()
});
obj.val('').trigger( 'change' );
um_ajax_get_members( directory );
@@ -1126,7 +1133,10 @@ jQuery(document.body).ready( function() {
if ( select.find('option:not(:disabled)').length > 1 ) {
select.prop('disabled', false);
}
select.select2('destroy').select2();
select.select2('destroy').select2({
dropdownParent: select.parent()
});
if ( directory.find( '.um-search-filter select[data-um-parent="' + filter_name + '"]' ).length > 0 ) {
select.trigger('change');
@@ -1250,7 +1260,9 @@ jQuery(document.body).ready( function() {
if ( select.find('option:not(:disabled)').length > 1 ) {
select.prop('disabled', false);
}
select.select2('destroy').select2();
select.select2('destroy').select2({
dropdownParent: select.parent()
});
if ( directory.find( '.um-search-filter select[data-um-parent="' + filter_name + '"]' ).length > 0 ) {
select.trigger('change');
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/js/um-scripts.js
+26 -11
View File
@@ -135,19 +135,34 @@ jQuery(document).ready(function() {
}
if ( typeof( jQuery.fn.select2 ) === 'function' ) {
jQuery(".um-s1").select2({
allowClear: true
}).on( 'change', unselectEmptyOption );
jQuery(".um-s1").each( function( e ) {
var obj = jQuery(this);
jQuery(".um-s2").select2({
allowClear: false,
minimumResultsForSearch: 10
}).on( 'change', unselectEmptyOption );
obj.select2({
allowClear: true,
dropdownParent: obj.parent()
}).on( 'change', unselectEmptyOption );
} );
jQuery(".um-s3").select2({
allowClear: false,
minimumResultsForSearch: -1
});
jQuery(".um-s2").each( function( e ) {
var obj = jQuery(this);
obj.select2({
allowClear: false,
minimumResultsForSearch: 10,
dropdownParent: obj.parent()
}).on( 'change', unselectEmptyOption );
} );
jQuery(".um-s3").each( function( e ) {
var obj = jQuery(this);
obj.select2({
allowClear: false,
minimumResultsForSearch: -1,
dropdownParent: obj.parent()
}).on( 'change', unselectEmptyOption );
} );
}
init_tipsy();
assets/js/um-scripts.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/sass/um-members.sass
+1
View File
@@ -233,6 +233,7 @@ body
.um-search-filter
+flex( row, flex-start, baseline, nowrap )
width: 100%
position: relative
.select2-container
float: left
includes/admin/core/class-admin-enqueue.php
+2 -2
View File
@@ -120,7 +120,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
}
wp_register_script( 'select2', $this->front_js_baseurl . 'select2/select2.full' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry' ), ultimatemember_version, true );
wp_register_script( 'select2', $this->front_js_baseurl . 'select2/select2.full' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry' ), '4.0.13', true );
wp_register_script( 'um_jquery_form', $this->front_js_baseurl . 'um-jquery-form' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_fileupload', $this->front_js_baseurl . 'um-fileupload' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_crop', $this->front_js_baseurl . 'um-crop' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
@@ -146,7 +146,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_script( 'um_modal', $this->front_js_baseurl . 'um-modal' . $this->suffix . '.js', array( 'um_responsive' ), ultimatemember_version, true );
wp_register_style( 'select2', $this->front_css_baseurl . 'select2/select2' . $this->suffix . '.css', array(), ultimatemember_version );
wp_register_style( 'select2', $this->front_css_baseurl . 'select2/select2' . $this->suffix . '.css', array(), '4.0.13' );
wp_register_style( 'um_datetime', $this->front_css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->front_css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_time', $this->front_css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), ultimatemember_version );
includes/core/class-enqueue.php
+2 -2
View File
@@ -95,7 +95,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_dequeue_script( 'select2');
wp_deregister_script('select2');
}
wp_register_script( 'select2', $this->js_baseurl . 'select2/select2.full' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'select2', $this->js_baseurl . 'select2/select2.full' . $this->suffix . '.js', array( 'jquery' ), '4.0.13', true );
wp_register_script( 'um_scrollbar', $this->js_baseurl . 'simplebar' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
@@ -177,7 +177,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_style( 'um_crop', $this->css_baseurl . 'um-crop.css', array(), ultimatemember_version );
wp_register_style( 'um_tipsy', $this->css_baseurl . 'um-tipsy.css', array(), ultimatemember_version );
wp_register_style( 'um_raty', $this->css_baseurl . 'um-raty.css', array(), ultimatemember_version );
wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), ultimatemember_version );
wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), '4.0.13' );
wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime', $this->css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );