Core: Move the logic of adding hidden input from stopeRequest to handle

Arkni · staabm · commit e0876fbd16a2 · 2017-06-26T15:54:52.000+02:00
The only scripted submits in this plugin are triggered by `stopRequest()`
when the remote method finished validating an element and the form was
submitted
diff --git a/src/core.js b/src/core.js
@@ -26,9 +26,10 @@ $.extend( $.fn, {
 		if ( validator.settings.onsubmit ) {
 
 			this.on( "click.validate", ":submit", function( event ) {
+
 				// Track the used submit button to properly handle scripted
 				// submits later.
-				validator.submitButton = event.target;
+				validator.submitButton = event.currentTarget;
 
 				// Allow suppressing validation by adding a cancel class to the submit button
 				if ( $( this ).hasClass( "cancel" ) ) {
@@ -50,17 +51,22 @@ $.extend( $.fn, {
 				}
 				function handle() {
 					var hidden, result;
-					if ( validator.settings.submitHandler ) {
-						if ( validator.submitButton ) {
 
-							// Insert a hidden input as a replacement for the missing submit button
-							hidden = $( "<input type='hidden'/>" )
-								.attr( "name", validator.submitButton.name )
-								.val( $( validator.submitButton ).val() )
-								.appendTo( validator.currentForm );
-						}
+					// Insert a hidden input as a replacement for the missing submit button
+					// The hidden input is inserted in two cases:
+					//   - A user defined a `submitHandler`
+					//   - There was a pending request due to `remote` method and `stopRequest()`
+					//     was called to submit the form in case it's valid
+					if ( validator.submitButton && ( validator.settings.submitHandler || validator.formSubmitted ) ) {
+						hidden = $( "<input type='hidden'/>" )
+							.attr( "name", validator.submitButton.name )
+							.val( $( validator.submitButton ).val() )
+							.appendTo( validator.currentForm );
+					}
+
+					if ( validator.settings.submitHandler ) {
 						result = validator.settings.submitHandler.call( validator, validator.currentForm, event );
-						if ( validator.submitButton ) {
+						if ( hidden ) {
 
 							// And clean up afterwards; thanks to no-block-scope, hidden can be referenced
 							hidden.remove();
@@ -1082,20 +1088,16 @@ $.extend( $.validator, {
 			delete this.pending[ element.name ];
 			$( element ).removeClass( this.settings.pendingClass );
 			if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
-				var hidden;
-				// If no submit handler is set but a submit button is present
-				// ensure the following scripted submit has the value of the
-				// submit button by injecting a hidden field.
-				if ( !this.settings.submitHandler && this.submitButton ) {
-					hidden = $("<input type='hidden'/>")
-					  .attr("name", this.submitButton.name)
-					  .val($(this.submitButton).val())
-					  .appendTo(this.currentForm);
-				}
 				$( this.currentForm ).submit();
-				if ( hidden ) {
-				  hidden.remove();
+
+				// Remove the hidden input that was used as a replacement for the
+				// missing submit button. The hidden input is added by `handle()`
+				// to ensure that the value of the used submit button is passed on
+				// for scripted submits triggered by this method
+				if ( this.submitButton ) {
+					$( "input:hidden[name='" + this.submitButton.name + "']", this.currentForm ).remove();
 				}
+
 				this.formSubmitted = false;
 			} else if ( !valid && this.pendingRequest === 0 && this.formSubmitted ) {
 				$( this.currentForm ).triggerHandler( "invalid-form", [ this ] );
