diff --git a/includes/admin/assets/js/um-admin-settings.js b/includes/admin/assets/js/um-admin-settings.js index a60670e0..e4f027c2 100644 --- a/includes/admin/assets/js/um-admin-settings.js +++ b/includes/admin/assets/js/um-admin-settings.js @@ -1,10 +1,24 @@ jQuery( document ).ready( function() { + + /** * Licenses */ jQuery( document.body ).on( 'click', '.um_license_deactivate', function() { jQuery(this).siblings('.um-option-field').val(''); - jQuery(this).parents('form.um-settings-form').trigger('submit'); + if ( jQuery(this).siblings('#submit').length ) { + // clear = true for passing the empty field value to the license form submission + jQuery(this).siblings('#submit').trigger('click',[ true ]); + } else { + jQuery(this).parents('form.um-settings-form').trigger('submit'); + } + }); + + + jQuery( document.body ).on( 'click', '.um-settings-form #submit', function( e, clear ) { + if ( ! clear && '' === jQuery(this).siblings('.um-option-field').val() ) { + return false; + } }); @@ -32,4 +46,4 @@ jQuery( document ).ready( function() { window.onbeforeunload = ''; }); } -}); \ No newline at end of file +}); diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 15fd23b0..9687d506 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -2943,6 +2943,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { +