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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

Browse Source 
# Conflicts:
#	assets/js/um-conditional.js
#	assets/js/um-conditional.min.js
#	assets/js/um-scripts.min.js
#	includes/core/class-enqueue.php
This commit is contained in:
Yurii Nalivaiko
2018-11-13 14:57:01 +02:00
parent 289a3a05d1 0d1a9f676b
commit 10d699333c
17 changed files with 788 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-forms.js
+18 -11
View File
@@ -123,10 +123,13 @@ jQuery(document).ready( function() {
button.siblings('.um-media-upload-data-width').val(attachment.width);
button.siblings('.um-media-upload-data-height').val(attachment.height);
button.siblings('.um-media-upload-data-thumbnail').val(attachment.thumbnail);
button.siblings('.um-media-upload-data-url').trigger('change');
button.siblings('.um-media-upload-url').val(attachment.url);
button.siblings('.um-clear-image').show();
button.hide();
jQuery( document ).trigger( 'um_media_upload_select', [button, attachment] );
});
frame.open();
@@ -137,16 +140,20 @@ jQuery(document).ready( function() {
});
jQuery('.um-clear-image').click( function(e) {
var default_image_url = jQuery(this).siblings('.um-forms-field').data('default');
jQuery(this).siblings('.um-set-image').show();
jQuery(this).hide();
jQuery(this).siblings('.icon_preview').attr( 'src', default_image_url );
jQuery(this).siblings('.um-media-upload-data-id').val('');
jQuery(this).siblings('.um-media-upload-data-width').val('');
jQuery(this).siblings('.um-media-upload-data-height').val('');
jQuery(this).siblings('.um-media-upload-data-thumbnail').val('');
jQuery(this).siblings('.um-forms-field').val( default_image_url );
jQuery(this).siblings('.um-media-upload-url').val( default_image_url );
var clear_button = jQuery(this);
var default_image_url = clear_button.siblings('.um-forms-field').data('default');
clear_button.siblings('.um-set-image').show();
clear_button.hide();
clear_button.siblings('.icon_preview').attr( 'src', default_image_url );
clear_button.siblings('.um-media-upload-data-id').val('');
clear_button.siblings('.um-media-upload-data-width').val('');
clear_button.siblings('.um-media-upload-data-height').val('');
clear_button.siblings('.um-media-upload-data-thumbnail').val('');
clear_button.siblings('.um-forms-field').val( default_image_url );
clear_button.siblings('.um-media-upload-data-url').trigger('change');
clear_button.siblings('.um-media-upload-url').val( default_image_url );
jQuery( document ).trigger( 'um_media_upload_clear', clear_button );
});
}
@@ -154,7 +161,7 @@ jQuery(document).ready( function() {
/**
* On option fields change
*/
jQuery('body').on('change', '.um-forms-field', function() {
jQuery( document.body ).on('change', '.um-forms-field', function() {
if ( jQuery('.um-forms-line[data-conditional*=\'"' + jQuery(this).data('field_id') + '",\']').length > 0 ) {
run_check_conditions();
}
includes/admin/core/class-admin-forms.php
+1 -1
View File
@@ -975,7 +975,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$class_attr = ' class="um-forms-field um-media-upload-data-url ' . $class . '"';
$data = array(
'field_id' => $field_data['id'],
'field_id' => $field_data['id'] . '_url',
);
if ( ! empty( $field_data['default']['url'] ) )
includes/admin/core/class-admin-settings.php
+1 -1
View File
@@ -1170,7 +1170,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
*/
do_action( "um_settings_page_before_" . $current_tab . "_" . $current_subtab . "_content" );
if ( in_array( $current_tab, apply_filters('um_settings_custom_tabs', array( 'licenses', 'install_info' ) ) ) || in_array( $current_subtab, apply_filters('um_settings_custom_subtabs', array() ) ) ) {
if ( in_array( $current_tab, apply_filters('um_settings_custom_tabs', array( 'licenses', 'install_info' ) ) ) || in_array( $current_subtab, apply_filters( 'um_settings_custom_subtabs', array(), $current_tab ) ) ) {
/**
* UM hook