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

- fixed callback function for select-type filter - return only existed values;

Browse Source 
- fixed conflict with php_data variable in admin JS;
This commit is contained in:
nikitasinelnikov
2019-11-22 11:55:21 +02:00
parent c8674d3209
commit 5c807204c3
10 changed files with 97 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-forms.js
+4 -4
View File
@@ -27,7 +27,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="um-multi-selects-option-line"><span class="um-field-wrapper">' + selector_html +
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + php_data.texts.remove + '</a></span></li>'
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span></li>'
);
list.find('li:last .um-hidden-multi-selects').attr('name', jQuery(this).data('name') ).
@@ -284,7 +284,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="um-md-default-filters-option-line"><span class="um-field-wrapper">' + selector_html +
'</span></span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + php_data.texts.remove + '</a></span><span class="um-field-wrapper2 um"></li>'
'</span></span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span><span class="um-field-wrapper2 um"></li>'
);
list.find('li:last .um-hidden-md-default-filters').attr('name', jQuery(this).data('name') ).
@@ -318,7 +318,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="' + classes + '"><span class="um-field-wrapper">' + text_html +
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-text-delete">' + php_data.texts.remove + '</a></span></li>'
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-text-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span></li>'
);
list.find('li:last .um-hidden-multi-text').attr('name', jQuery(this).data('name') ).
@@ -366,7 +366,7 @@ jQuery(document).ready( function() {
frame = wp.media({
title: button.data('upload_frame'),
button: {
text: php_data.texts.select
text: wp.i18n.__( 'Select', 'ultimate-member' )
},
multiple: false // Set to true to allow multiple files to be selected
});
includes/admin/assets/js/um-admin-settings.js
+1 -1
View File
@@ -21,7 +21,7 @@ jQuery( document ).ready( function() {
jQuery( '#um-settings-wrap .um-nav-tab-wrapper a, #um-settings-wrap .subsubsub a' ).click( function() {
if ( changed ) {
window.onbeforeunload = function() {
return php_data.onbeforeunload_text;
return wp.i18n.__( 'Are sure, maybe some settings not saved', 'ultimate-member' );
};
} else {
window.onbeforeunload = '';
includes/admin/core/class-admin-enqueue.php
+2 -21
View File
@@ -227,17 +227,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_style( 'um_admin_forms', $this->css_url . 'um-admin-forms.css', array( 'wp-color-picker', 'um_ui' ), ultimatemember_version );
wp_enqueue_style( 'um_admin_forms' );
wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true );
wp_enqueue_script( 'um_admin_forms' );
$localize_data = array(
'texts' => array(
'remove' => __( 'Remove', 'ultimate-member' ),
'select' => __( 'Select', 'ultimate-member' )
)
);
wp_localize_script( 'um_admin_forms', 'php_data', $localize_data );
}
@@ -257,18 +248,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_style( 'um_admin_settings', $this->css_url . 'um-admin-settings.css', array(), ultimatemember_version );
wp_enqueue_style( 'um_admin_settings' );
wp_register_script( 'um_admin_settings', $this->js_url . 'um-admin-settings.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_admin_settings', $this->js_url . 'um-admin-settings.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true );
wp_enqueue_script( 'um_admin_settings' );
$localize_data = array(
'onbeforeunload_text' => __( 'Are sure, maybe some settings not saved', 'ultimate-member' ),
'texts' => array(
'remove' => __( 'Remove', 'ultimate-member' ),
'select' => __( 'Select', 'ultimate-member' )
)
);
wp_localize_script( 'um_admin_settings', 'php_data', $localize_data );
}