Integrate new file fields

.gitignore

@@ -18,4 +18,6 @@ wordpress
 wp-content
 cypress/screenshots
 cypress/videos
-build
+build
+
+wp-test-case

Gruntfile.js

@@ -157,7 +157,8 @@ module.exports = function (grunt) {
                     'assets/build/css/caldera-grid.min.css',
                     'assets/build/css/caldera-alert.min.css',
                     'assets/build/css/caldera-form.min.css',
-                    'assets/build/css/fields.min.css'
+                    'assets/build/css/fields.min.css',
+                    'clients/render/build/style.min.css'
                  ],
                 dest: 'assets/css/caldera-forms-front.css'
             },

README.md

@@ -99,6 +99,7 @@ The local server is [http://localhost:8228](http://localhost:8228)
 
 #### Commands
 ##### Composer
+* `composer test:php` - Run PHP tests -- isolated unit tests and the WordPress integration tests.
 * `composer dev:install` - Installs dependencies, Docker-based test environment and sets up test forms.
 * `composer dev:destroy` - Deletes dependencies and the Docker-based test environment.
 * `composer wp:install` - Installs Docker-based test environment.
@@ -123,6 +124,7 @@ Probably don't use these directly. They will change. Must be prefaced with `dock
 * `wp cf delete-test-forms` - Delete test forms
 * `wp cf create-test-pages` - Import test pages
 * `wp cf delete-test-pages` - Delete test pages
+
 ### Release To WordPress.org
 ##### Requires
 * [svn](https://subversion.apache.org/quick-start#installing-the-client)

assets/js/ajax-core.js

@@ -129,22 +129,43 @@ jQuery(function($){
 
                 ev.preventDefault();
 
-                var form	=	$(el),
-                    buttons = 	form.find(':submit');
-
-                if( form.data('_cf_manual') ){
-                    form.find('[name="cfajax"]').remove();
+                var $form	=	$(el),
+                    buttons = 	$form.find(':submit');
+                var pending = [];
+
+				/**
+                 * This event is triggered directly before the request for form submission is made
+                 *
+                 * Runs after cf.form.submit
+                 *
+                 * @since 1.8.0
+				 */
+				$( document ).trigger( 'cf.form.request', {
+                    $form: $form,
+                    formIdAttr: $form.attr( 'id' )
+                });
+
+				//Check if any cf2 fields are blocking submit
+				var cf2 = window.cf2[ $form.attr( 'id' ) ];
+				if( 'object' === typeof cf2 ){
+					if( cf2.hasOwnProperty( 'pending' ) && cf2.pending.length ){
+						return false;
+					}
+				}
+
+                if( $form.data('_cf_manual') ){
+                    $form.find('[name="cfajax"]').remove();
                     return false;
                 }
 
-                if( !form.data( 'postDisable' ) ){
+                if( !$form.data( 'postDisable' ) ){
                     buttons.prop('disabled',true);
                 }
 
 
                 if( typeof cf_uploader_filelist === 'object'  ){
                     // verify required
-                    form.find('.cf-uploader-trigger').slideUp();
+                    $form.find('.cf-uploader-trigger').slideUp();
                     // setup file uploader
                     var has_files = false;
                     var count = cf_upload_queue.length;
@@ -161,7 +182,7 @@ jQuery(function($){
                         data.append( field.data('field'), cf_uploader_filelist[ file ].file );
                         data.append( 'field', field.data('field') );
                         data.append( 'control', field.data('controlid') );
-                        cf_push_file_upload( form, file_number, data );
+                        cf_push_file_upload( $form, file_number, data );
                         field.val('');//@see https://github.com/CalderaWP/Caldera-Forms/issues/2514#issuecomment-395213433
                         field.attr('type','hidden');
                         field.val(field.data('controlid'));
@@ -176,6 +197,10 @@ jQuery(function($){
                     }
                 }
 
+
+
+
+
             },
             error : function( obj ){
                 if( obj.jqxhr.status === 404){
@@ -286,4 +311,4 @@ jQuery(function($){
     };
 
     resBaldrickTriggers();
-});
+});