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

Merge pull request #768 from ultimatemember/fix/jQuery_3_compatibility

Browse Source 
jQuery 3 compatibility (for WordPress 5.7 and higher)
This commit is contained in:
Nikita Sinelnikov
2021-03-05 18:21:34 +02:00
committed by GitHub
parent ec2d99157b 16bf0ebd68
commit 88765d26ef
14 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-conditional.js
+9 -9
View File
@@ -244,7 +244,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'empty' ) {
var field_value = jQuery.isArray( live_field_value ) ? live_field_value.join('') : live_field_value;
var field_value = Array.isArray( live_field_value ) ? live_field_value.join('') : live_field_value;
if ( ! field_value || field_value === '' ) {
$owners[ condition.owner ][ index ] = true;
} else {
@@ -253,7 +253,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'not empty' ) {
var field_value = jQuery.isArray( live_field_value ) ? live_field_value.join('') : live_field_value;
var field_value = Array.isArray( live_field_value ) ? live_field_value.join('') : live_field_value;
if ( field_value && field_value !== '' ) {
$owners[ condition.owner ][ index ] = true;
} else {
@@ -262,7 +262,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'equals to' ) {
var field_value = ( jQuery.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
var field_value = ( Array.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
if ( condition.value === field_value && um_in_array( field_value, $owners_values[ condition.owner ] ) ) {
$owners[ condition.owner ][ index ] = true;
} else {
@@ -271,7 +271,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'not equals' ) {
var field_value = ( jQuery.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
var field_value = ( Array.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
if ( jQuery.isNumeric(condition.value) && parseInt(field_value) !== parseInt( condition.value ) && field_value && ! um_in_array( field_value, $owners_values[ condition.owner ] ) ) {
$owners[ condition.owner ][ index ] = true;
} else if ( condition.value != field_value && ! um_in_array( field_value, $owners_values[ condition.owner ] ) ) {
@@ -282,7 +282,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'greater than' ) {
var field_value = ( jQuery.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
var field_value = ( Array.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
if ( jQuery.isNumeric( condition.value ) && parseInt( field_value ) > parseInt( condition.value ) ) {
$owners[ condition.owner ][ index ] = true;
} else {
@@ -291,7 +291,7 @@ function um_apply_conditions( $dom, is_single_update ) {
}
if ( condition.operator === 'less than' ) {
var field_value = ( jQuery.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
var field_value = ( Array.isArray( live_field_value ) && live_field_value.length === 1 ) ? live_field_value[0] : live_field_value;
if ( jQuery.isNumeric( condition.value ) && parseInt( field_value ) < parseInt( condition.value ) ) {
$owners[ condition.owner ][ index ] = true;
} else {
@@ -424,12 +424,12 @@ function um_field_restore_default_value( $dom ) {
case 'checkbox':
if ( $dom.find('input[type="checkbox"]:checked').length >= 1 ) {
$dom.find('input[type="checkbox"]:checked').removeAttr('checked');
$dom.find('input[type="checkbox"]:checked').prop('checked', false);
$dom.find('span.um-field-checkbox-state i').removeClass('um-icon-android-checkbox-outline');
$dom.find('span.um-field-checkbox-state i').addClass('um-icon-android-checkbox-outline-blank');
$dom.find('.um-field-checkbox.active').removeClass('active');
if ( jQuery.isArray( field.value ) ) {
if ( Array.isArray( field.value ) ) {
jQuery.each( field.value, function ( i, value ) {
var cbox_elem = $dom.find('input[type="checkbox"][value="' + value + '"]');
cbox_elem.attr('checked', true);
@@ -453,7 +453,7 @@ function um_field_restore_default_value( $dom ) {
setTimeout( function() {
$dom.find('input[type="radio"]:checked').removeAttr('checked');
$dom.find('input[type="radio"]:checked').prop('checked', false);
$dom.find('span.um-field-radio-state i').removeClass('um-icon-android-radio-button-on');
$dom.find('span.um-field-radio-state i').addClass('um-icon-android-radio-button-off');
assets/js/um-functions.js
+4 -4
View File
@@ -811,16 +811,16 @@ function um_reset_field( dOm ){
.find('input,textarea,select')
.not(':button, :submit, :reset, :hidden')
.val('')
.removeAttr('checked')
.removeAttr('selected');
.prop('checked', false)
.prop('selected', false);
}
jQuery(function(){
// Submit search form on keypress 'Enter'
jQuery(".um-search form *").keypress(function(e){
jQuery(".um-search form *").on( 'keypress', function(e){
if (e.which == 13) {
jQuery('.um-search form').submit();
jQuery('.um-search form').trigger('submit');
return false;
}
});
assets/js/um-jquery-form.js
+1 -1
View File
@@ -364,7 +364,7 @@ $.fn.ajaxSubmit = function(options) {
el.prop('disabled', false);
}
else {
el.removeAttr('disabled');
el.prop('disabled', false);
}
}
}
assets/js/um-members.js
+2 -2
View File
@@ -53,7 +53,7 @@ function um_set_url_from_data( directory, key, value ) {
var new_data = {};
if ( jQuery.isArray( value ) ) {
if ( Array.isArray( value ) ) {
jQuery.each( value, function( i ) {
value[ i ] = encodeURIComponent( value[ i ] );
});
@@ -924,7 +924,7 @@ jQuery(document.body).ready( function() {
//filters controls
jQuery('.um-member-directory-filters-a').click( function() {
jQuery('.um-member-directory-filters-a').on( 'click', function() {
var obj = jQuery(this);
var search_bar = obj.parents('.um-directory').find('.um-search');
assets/js/um-profile.js
+4 -4
View File
@@ -15,7 +15,7 @@ jQuery(document).ready(function() {
jQuery( document.body ).on( 'click', '.um-profile-save', function(e){
e.preventDefault();
jQuery(this).parents('.um').find('form').submit();
jQuery(this).parents('.um').find('form').trigger('submit');
return false;
});
@@ -104,7 +104,7 @@ jQuery(document).ready(function() {
}*/
//um_update_bio_countdown();
//jQuery( 'textarea[id="um-meta-bio"]' ).change( um_update_bio_countdown ).keyup( um_update_bio_countdown ).trigger('change');
//jQuery( 'textarea[id="um-meta-bio"]' ).on('change', um_update_bio_countdown ).keyup( um_update_bio_countdown ).trigger('change');
// Bio characters limit
jQuery( document.body ).on( 'change, keyup', 'textarea[id="um-meta-bio"]', function() {
@@ -122,7 +122,7 @@ jQuery(document).ready(function() {
jQuery( 'textarea[id="um-meta-bio"]' ).trigger('change');
jQuery( '.um-profile-edit a.um_delete-item' ).click( function(e) {
jQuery( '.um-profile-edit a.um_delete-item' ).on( 'click', function(e) {
e.preventDefault();
if ( ! confirm( wp.i18n.__( 'Are you sure that you want to delete this user?', 'ultimate-member' ) ) ) {
@@ -135,7 +135,7 @@ jQuery(document).ready(function() {
* @see https://www.html5rocks.com/en/mobile/touchandmouse/
*/
jQuery( '.um-profile-nav a' ).on( 'touchend', function(e) {
e.currentTarget.click();
jQuery( e.currentTarget).trigger( "click" );
});
});
assets/js/um-scripts.js
+3 -3
View File
@@ -491,11 +491,11 @@ jQuery(document).ready(function() {
}
});
jQuery('.um-form input[class="um-button"][type="submit"]').removeAttr('disabled');
jQuery('.um-form input[class="um-button"][type="submit"]').prop('disabled', false);
jQuery(document).one('click', '.um:not(.um-account) .um-form input[class="um-button"][type="submit"]:not(.um-has-recaptcha)', function() {
jQuery(this).attr('disabled','disabled');
jQuery(this).parents('form').submit();
jQuery(this).parents('form').trigger('submit');
});
@@ -599,7 +599,7 @@ jQuery(document).ready(function() {
me.find('option[value!=""]').remove();
if ( ! me.hasClass('um-child-option-disabled') ) {
me.removeAttr('disabled');
me.prop('disabled', false);
}
var arr_items = [],