Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 14:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Administration: Audible messages on AJAX error cases.

Browse Source 
Issues appropriate audible messages via `wp.a11y.speak()` when `ajax-response.js` generates an error via `wp_die()`.

Props afercia, alexstine.
Fixes #54483.
Built from https://develop.svn.wordpress.org/trunk@53709


git-svn-id: http://core.svn.wordpress.org/trunk@53268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
joedolson 2022-07-16 01:08:10 +00:00
parent 9f851abc3f
commit a65abecc15
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/js/wp-ajax-response.js
View File

@ -53,19 +53,27 @@ window.wpAjax = jQuery.extend( {
parsed.responses.push( response );
} );
if ( err.length ) {
re.html( '<div class="error">' + err + '</div>' );
re.html( '<div class="notice notice-error">' + err + '</div>' );
wp.a11y.speak( err );
} else if ( noticeMessage.length ) {
re.html( '<div class="updated notice is-dismissible"><p>' + noticeMessage + '</p></div>');
re.html( '<div class="notice notice-success is-dismissible"><p>' + noticeMessage + '</p></div>');
jQuery(document).trigger( 'wp-updates-notice-added' );
wp.a11y.speak( noticeMessage );
}
return parsed;
}
if ( isNaN(x) ) { return !re.html('<div class="error"><p>' + x + '</p></div>'); }
x = parseInt(x,10);
if ( -1 === x ) { return !re.html('<div class="error"><p>' + wpAjax.noPerm + '</p></div>'); }
else if ( 0 === x ) { return !re.html('<div class="error"><p>' + wpAjax.broken + '</p></div>'); }
if ( isNaN( x ) ) {
wp.a11y.speak( x );
return ! re.html( '<div class="notice notice-error"><p>' + x + '</p></div>' );
}
x = parseInt( x, 10 );
if ( -1 === x ) {
wp.a11y.speak( wpAjax.noPerm );
return ! re.html( '<div class="notice notice-error"><p>' + wpAjax.noPerm + '</p></div>' );
} else if ( 0 === x ) {
wp.a11y.speak( wpAjax.broken );
return ! re.html( '<div class="notice notice-error"><p>' + wpAjax.broken + '</p></div>' );
}
return true;
},
invalidateForm: function ( selector ) {

2
wp-includes/js/wp-ajax-response.min.js vendored
View File

@ -1,2 +1,2 @@
/*! This file is auto-generated */
window.wpAjax=jQuery.extend({unserialize:function(e){var r,t,i,a,n={};if(!e)return n;for(i in t=(e=(r=e.split("?"))[1]?r[1]:e).split("&"))"function"==typeof t.hasOwnProperty&&!t.hasOwnProperty(i)||(n[(a=t[i].split("="))[0]]=a[1]);return n},parseAjaxResponse:function(a,e,n){var o={},e=jQuery("#"+e).empty(),s="",t="";return a&&"object"==typeof a&&a.getElementsByTagName("wp_ajax")?(o.responses=[],o.errors=!1,jQuery("response",a).each(function(){var e=jQuery(this),r=jQuery(this.firstChild),i={action:e.attr("action"),what:r.get(0).nodeName,id:r.attr("id"),oldId:r.attr("old_id"),position:r.attr("position")};i.data=jQuery("response_data",r).text(),i.supplemental={},jQuery("supplemental",r).children().each(function(){"notice"===this.nodeName?t+=jQuery(this).text():i.supplemental[this.nodeName]=jQuery(this).text()}).length||(i.supplemental=!1),i.errors=[],jQuery("wp_error",r).each(function(){var e=jQuery(this).attr("code"),r={code:e,message:this.firstChild.nodeValue,data:!1},t=jQuery('wp_error_data[code="'+e+'"]',a);t&&(r.data=t.get()),(t=jQuery("form-field",t).text())&&(e=t),n&&wpAjax.invalidateForm(jQuery("#"+n+' :input[name="'+e+'"]').parents(".form-field:first")),s+="<p>"+r.message+"</p>",i.errors.push(r),o.errors=!0}).length||(i.errors=!1),o.responses.push(i)}),s.length?(e.html('<div class="error">'+s+"</div>"),wp.a11y.speak(s)):t.length&&(e.html('<div class="updated notice is-dismissible"><p>'+t+"</p></div>"),jQuery(document).trigger("wp-updates-notice-added"),wp.a11y.speak(t)),o):isNaN(a)?!e.html('<div class="error"><p>'+a+"</p></div>"):-1===(a=parseInt(a,10))?!e.html('<div class="error"><p>'+wpAjax.noPerm+"</p></div>"):0!==a||!e.html('<div class="error"><p>'+wpAjax.broken+"</p></div>")},invalidateForm:function(e){return jQuery(e).addClass("form-invalid").find("input").one("change wp-check-valid-field",function(){jQuery(this).closest(".form-invalid").removeClass("form-invalid")})},validateForm:function(e){return e=jQuery(e),!wpAjax.invalidateForm(e.find(".form-required").filter(function(){return""===jQuery("input:visible",this).val()})).length}},wpAjax||{noPerm:"Sorry, you are not allowed to do that.",broken:"Something went wrong."}),jQuery(function(e){e("form.validate").on("submit",function(){return wpAjax.validateForm(e(this))})});
window.wpAjax=jQuery.extend({unserialize:function(e){var t,r,i,n,a={};if(!e)return a;for(i in r=(e=(t=e.split("?"))[1]?t[1]:e).split("&"))"function"==typeof r.hasOwnProperty&&!r.hasOwnProperty(i)||(a[(n=r[i].split("="))[0]]=n[1]);return a},parseAjaxResponse:function(n,e,a){var o={},e=jQuery("#"+e).empty(),s="",r="";return n&&"object"==typeof n&&n.getElementsByTagName("wp_ajax")?(o.responses=[],o.errors=!1,jQuery("response",n).each(function(){var e=jQuery(this),t=jQuery(this.firstChild),i={action:e.attr("action"),what:t.get(0).nodeName,id:t.attr("id"),oldId:t.attr("old_id"),position:t.attr("position")};i.data=jQuery("response_data",t).text(),i.supplemental={},jQuery("supplemental",t).children().each(function(){"notice"===this.nodeName?r+=jQuery(this).text():i.supplemental[this.nodeName]=jQuery(this).text()}).length||(i.supplemental=!1),i.errors=[],jQuery("wp_error",t).each(function(){var e=jQuery(this).attr("code"),t={code:e,message:this.firstChild.nodeValue,data:!1},r=jQuery('wp_error_data[code="'+e+'"]',n);r&&(t.data=r.get()),(r=jQuery("form-field",r).text())&&(e=r),a&&wpAjax.invalidateForm(jQuery("#"+a+' :input[name="'+e+'"]').parents(".form-field:first")),s+="<p>"+t.message+"</p>",i.errors.push(t),o.errors=!0}).length||(i.errors=!1),o.responses.push(i)}),s.length?(e.html('<div class="notice notice-error">'+s+"</div>"),wp.a11y.speak(s)):r.length&&(e.html('<div class="notice notice-success is-dismissible"><p>'+r+"</p></div>"),jQuery(document).trigger("wp-updates-notice-added"),wp.a11y.speak(r)),o):isNaN(n)?(wp.a11y.speak(n),!e.html('<div class="notice notice-error"><p>'+n+"</p></div>")):-1===(n=parseInt(n,10))?(wp.a11y.speak(wpAjax.noPerm),!e.html('<div class="notice notice-error"><p>'+wpAjax.noPerm+"</p></div>")):0!==n||(wp.a11y.speak(wpAjax.broken),!e.html('<div class="notice notice-error"><p>'+wpAjax.broken+"</p></div>"))},invalidateForm:function(e){return jQuery(e).addClass("form-invalid").find("input").one("change wp-check-valid-field",function(){jQuery(this).closest(".form-invalid").removeClass("form-invalid")})},validateForm:function(e){return e=jQuery(e),!wpAjax.invalidateForm(e.find(".form-required").filter(function(){return""===jQuery("input:visible",this).val()})).length}},wpAjax||{noPerm:"Sorry, you are not allowed to do that.",broken:"Something went wrong."}),jQuery(function(e){e("form.validate").on("submit",function(){return wpAjax.validateForm(e(this))})});

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-alpha-53708';
$wp_version = '6.1-alpha-53709';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.