File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change 340
340
$document . delegate ( rails . formSubmitSelector , 'submit.rails' , function ( e ) {
341
341
var form = $ ( this ) ,
342
342
remote = form . data ( 'remote' ) !== undefined ,
343
- blankRequiredInputs = rails . blankInputs ( form , rails . requiredInputSelector ) ,
344
- nonBlankFileInputs = rails . nonBlankInputs ( form , rails . fileInputSelector ) ;
343
+ blankRequiredInputs ,
344
+ nonBlankFileInputs ;
345
345
346
346
if ( ! rails . allowAction ( form ) ) return rails . stopEverything ( e ) ;
347
347
348
348
// skip other logic when required values are missing or file upload is present
349
- if ( blankRequiredInputs && form . attr ( "novalidate" ) == undefined && rails . fire ( form , 'ajax:aborted:required' , [ blankRequiredInputs ] ) ) {
350
- return rails . stopEverything ( e ) ;
349
+ if ( form . attr ( 'novalidate' ) == undefined ) {
350
+ blankRequiredInputs = rails . blankInputs ( form , rails . requiredInputSelector ) ;
351
+ if ( blankRequiredInputs && rails . fire ( form , 'ajax:aborted:required' , [ blankRequiredInputs ] ) ) {
352
+ return rails . stopEverything ( e ) ;
353
+ }
351
354
}
352
355
353
356
if ( remote ) {
357
+ nonBlankFileInputs = rails . nonBlankInputs ( form , rails . fileInputSelector ) ;
354
358
if ( nonBlankFileInputs ) {
355
359
// slight timeout so that the submit button gets properly serialized
356
360
// (make it easy for event handler to serialize form without disabled values)
You can’t perform that action at this time.
0 commit comments