WordPress 4.0.1

[autoinstalls/wordpress.git] / wp-includes / js / wp-ajax-response.js

diff --git a/wp-includes/js/wp-ajax-response.js b/wp-includes/js/wp-ajax-response.js
index d941f2179ef0cf9949a551b9990e6ec2d25bd014..eb46267852c84c2f659a7f100965f7432e1cfd47 100644 (file)
--- a/wp-includes/js/wp-ajax-response.js
+++ b/wp-includes/js/wp-ajax-response.js
@@ -1,38 +1,37 @@
 var wpAjax = jQuery.extend( {
        unserialize: function( s ) {
-               var r = {}; if ( !s ) { return r; }
-               var q = s.split('?'); if ( q[1] ) { s = q[1]; }
-               var pp = s.split('&');
-               for ( var i in pp ) {
+               var r = {}, q, pp, i, p;
+               if ( !s ) { return r; }
+               q = s.split('?'); if ( q[1] ) { s = q[1]; }
+               pp = s.split('&');
+               for ( i in pp ) {
                        if ( jQuery.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
-                       var p = pp[i].split('=');
+                       p = pp[i].split('=');
                        r[p[0]] = p[1];
                }
                return r;
        },
        parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission
-               var parsed = {};
-               var re = jQuery('#' + r).html('');
+               var parsed = {}, re = jQuery('#' + r).html(''), err = '';
+
                if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) {
                        parsed.responses = [];
                        parsed.errors = false;
-                       var err = '';
                        jQuery('response', x).each( function() {
-                               var th = jQuery(this);
-                               var child = jQuery(this.firstChild);
-                               var response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
+                               var th = jQuery(this), child = jQuery(this.firstChild), response;
+                               response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
                                response.data = jQuery( 'response_data', child ).text();
                                response.supplemental = {};
                                if ( !jQuery( 'supplemental', child ).children().each( function() {
                                        response.supplemental[this.nodeName] = jQuery(this).text();
-                               } ).size() ) { response.supplemental = false }
+                               } ).size() ) { response.supplemental = false; }
                                response.errors = [];
                                if ( !jQuery('wp_error', child).each( function() {
-                                       var code = jQuery(this).attr('code');
-                                       var anError = { code: code, message: this.firstChild.nodeValue, data: false };
-                                       var errorData = jQuery('wp_error_data[code="' + code + '"]', x);
+                                       var code = jQuery(this).attr('code'), anError, errorData, formField;
+                                       anError = { code: code, message: this.firstChild.nodeValue, data: false };
+                                       errorData = jQuery('wp_error_data[code="' + code + '"]', x);
                                        if ( errorData ) { anError.data = errorData.get(); }
-                                       var formField = jQuery( 'form-field', errorData ).text();
+                                       formField = jQuery( 'form-field', errorData ).text();
                                        if ( formField ) { code = formField; }
                                        if ( e ) { wpAjax.invalidateForm( jQuery('#' + e + ' :input[name="' + code + '"]' ).parents('.form-field:first') ); }
                                        err += '<p>' + anError.message + '</p>';
@@ -51,10 +50,15 @@ var wpAjax = jQuery.extend( {
                return true;
        },
        invalidateForm: function ( selector ) {
-               return jQuery( selector ).addClass( 'form-invalid' ).change( function() { jQuery(this).removeClass( 'form-invalid' ); } );
+               return jQuery( selector ).addClass( 'form-invalid' ).find('input:visible').change( function() { jQuery(this).closest('.form-invalid').removeClass( 'form-invalid' ); } );
        },
        validateForm: function( selector ) {
                selector = jQuery( selector );
-               return !wpAjax.invalidateForm( selector.find('.form-required').andSelf().filter('.form-required:has(:input[value=""]), .form-required:input[value=""]') ).size();
+               return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() === ''; } ) ).size();
        }
 }, wpAjax || { noPerm: 'You do not have permission to do that.', broken: 'An unidentified error has occurred.' } );
+
+// Basic form validation
+jQuery(document).ready( function($){
+       $('form.validate').submit( function() { return wpAjax.validateForm( $(this) ); } );
+});